From 51385d94cde999d18275eef8d10b4e8c78c61166 Mon Sep 17 00:00:00 2001
From: GopiKrishnaDharavath
 <76718178+GopiKrishnaDharavath@users.noreply.github.com>
Date: Sun, 3 Jan 2021 23:17:56 +0530
Subject: [PATCH 1/3] GopiKrishnaDharavath completed subtask-1

---
 README.md | 42 ++++++++++--------------------------------
 1 file changed, 10 insertions(+), 32 deletions(-)

diff --git a/README.md b/README.md
index eb33eea..d755023 100644
--- a/README.md
+++ b/README.md
@@ -1,33 +1,11 @@
-# Fun With Branches 😉
-Welcome Guys & Gals to the repository, where you will be completing your Task 2️⃣ of FOSS Workshop.
-<br>
-<br>
-We have divided the Task 2, into 3️⃣ subtasks, and the points will be awarded accordingly.
 
-<hr>
-
-## Sub-Task 1
-You will find a folder, named as <i>Subtask-1</i> in the <b>main</b> branch of this repository. In that folder, you have to create a text file the  name of which will be your <b>Github Username</b>.  
-In that text file, you have to answer the following things :
-- Your Full Name
-- Your Nick Name (or something, you would like to be known as)
-- Your Hometown & Homestate 😂
-- What are you most excited to learn in the APK Month?
-- What all societies do you want to be a part of during your 4 years of college life?
-- The Course you Hate the Most
-- Github Profile URL
-- Facebook Profile URL
-- Instagram Profile URL
-  
-You will find a sample text file in that folder for your reference. Once you have answered all these ❓, you just have to save the file, and push it to the <b>main</b> branch.
-
-<hr>
-
-## Format of Commit Message
-```<Github_username> completed Subtask-1```  
-Make sure to use the above format only, while commiting your changes for Subtask-1.
-
-<hr>
-
-## What to do after Pushing?
-Once you have pushed your changes, make sure to make a PR(Pull Request) in the main branch. Once you have done that, give yourself a pat on your back, for completing Subtask-1, and proceed to the branch <b>Subtask-2</b>, for further instructions.
\ No newline at end of file
+-  Dharavath gopi krishna
+-  G.k
+-  kothagudem and telangana
+-  anything that related  to programming
+-  IIIC
+-  POM
+- https://github.com/GopiKrishnaDharavath
+- https://www.facebook.com/dharavath.gopikrishna.715169
+-  NO Instagram 
+ 
\ No newline at end of file

From 7add9d051ad540c67e4b63ae6220236dbf0a202f Mon Sep 17 00:00:00 2001
From: GopiKrishnaDharavath
 <76718178+GopiKrishnaDharavath@users.noreply.github.com>
Date: Mon, 4 Jan 2021 08:35:32 +0530
Subject: [PATCH 2/3] GopiKrishnaDharavath completed subtask-2

---
 subtask-2/abot senoirs.txt | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 subtask-2/abot senoirs.txt

diff --git a/subtask-2/abot senoirs.txt b/subtask-2/abot senoirs.txt
new file mode 100644
index 0000000..76610de
--- /dev/null
+++ b/subtask-2/abot senoirs.txt	
@@ -0,0 +1,2 @@
+- A.R.
+He is a kind person and has always helped me
\ No newline at end of file

From f2eba629532be2672a7349a1a7b6a021c7e8b628 Mon Sep 17 00:00:00 2001
From: GopiKrishnaDharavath
 <76718178+GopiKrishnaDharavath@users.noreply.github.com>
Date: Mon, 4 Jan 2021 08:59:35 +0530
Subject: [PATCH 3/3] GopiKrishnaDharavath completed subtask-3

---
 subtask-2/merge conflicts.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 subtask-2/merge conflicts.txt

diff --git a/subtask-2/merge conflicts.txt b/subtask-2/merge conflicts.txt
new file mode 100644
index 0000000..67dff57
--- /dev/null
+++ b/subtask-2/merge conflicts.txt	
@@ -0,0 +1 @@
+merge conflict- subtask-3