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

+ 2 - 2
README.md

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