omkar_somaskar hace 2 años
padre
commit
c6de4c38ca
Se han modificado 1 ficheros con 5 adiciones y 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