omkar_somaskar %!s(int64=2) %!d(string=hai) anos
pai
achega
c6de4c38ca
Modificáronse 1 ficheiros con 5 adicións e 1 borrados
  1. 5 1
      README.md

+ 5 - 1
README.md

@@ -1,2 +1,6 @@
 rupa jha rocks!
-1234 omkar issue file exists.
+<<<<<<< HEAD
+=======
+1234 omkar issue file exists.
+this is 4th branch
+>>>>>>> 53230e60ab9d042c838579731d1def7ee2032930