6 Achegas 53230e60ab ... c6de4c38ca

Autor SHA1 Mensaxe Data
  omkar_somaskar c6de4c38ca changes %!s(int64=2) %!d(string=hai) anos
  omkar_somaskar 0f1e517056 changes %!s(int64=2) %!d(string=hai) anos
  omkar_somaskar f97d95d093 minor changes %!s(int64=2) %!d(string=hai) anos
  omkar_somaskar 96a3177db7 minor changes %!s(int64=2) %!d(string=hai) anos
  omkar_somaskar 039f5b04d0 minor changes %!s(int64=2) %!d(string=hai) anos
  omkar_somaskar b70e53bcfd minor changes %!s(int64=2) %!d(string=hai) anos
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!
-this is 4th branch hf
+<<<<<<< HEAD
+=======
+1234 omkar issue file exists.
+this is 4th branch
+>>>>>>> 53230e60ab9d042c838579731d1def7ee2032930