Skip to content

Commit 7434a18

Browse files
anasanshuanasanshu
committed
merged branch
2 parents ebe2228 + ec68584 commit 7434a18

9 files changed

+29
-1
lines changed

‎.README.md.swp‎

4 KB
Binary file not shown.

‎.README_BASE_2032.md.swp‎ renamed to ‎.README_BASE_8032.md.swp‎

4 KB
Binary file not shown.

‎.README_LOCAL_2032.md.swp‎ renamed to ‎.README_LOCAL_8032.md.swp‎

4 KB
Binary file not shown.

‎.README_REMOTE_2032.md.swp‎ renamed to ‎.README_REMOTE_8032.md.swp‎

4 KB
Binary file not shown.

‎README.md‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,11 @@ Wassup Anish? So what are we learning today?
22
Branch hai bhai branch hai
33
Joke #2 - What do you call a thousand garden in hindi??
44
Ans - check in master branch
5-
Joke #4 - and mand ka tola, jo ni nacha ------ nacho
5+
Joke #4 - and mand ka tola, jo ni nacha ------ nacho
6+
lets play a game... post jokes in here for other to read. how about it?
7+
ofcourse we can use internet. alright?
8+
### joke no.1
9+
Q: Where do robbers go to the bathroom
10+
A: Arrest-room</br>
11+
For the second joke, checkout the readme-edit branch, you'll find the clue there</br>
12+
#Joke 2 Ans - Hazaribagh :P :D</br>

‎README_BACKUP_8032.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
Wassup Anish? So what are we learning today?
2+
<<<<<<< HEAD
3+
Branch hai bhai branch hai
4+
=======
5+
lets play a game... post jokes in here for other to read. how about it?
6+
ofcourse we can use internet. alright?
7+
8+
### joke no.1
9+
Q: Where do robbers go to the bathroom
10+
A: Arrest-room
11+
>>>>>>> 62380656592f3c06fc036ff6d2e351e6d81ee504

‎README_BASE_8032.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Wassup Anish? So what are we learning today?

‎README_LOCAL_8032.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Wassup Anish? So what are we learning today?
2+
Branch hai bhai branch hai

‎README_REMOTE_8032.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
Wassup Anish? So what are we learning today?
2+
lets play a game... post jokes in here for other to read. how about it?
3+
ofcourse we can use internet. alright?
4+
5+
### joke no.1
6+
Q: Where do robbers go to the bathroom
7+
A: Arrest-room

0 commit comments

Comments
 (0)