second

abuharis · Oct 12, 2016 · 2559a06 · 2559a06
2 parents ef1024e + 4c04d75
commit 2559a06
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -1 +1,5 @@
 # gittest
+<<<<<<< HEAD
+=======
+This is for test
+>>>>>>> 4c04d7500b637e504122472052d78b857070461c
diff --git a/test b/test
@@ -0,0 +1 @@
+jhahdjkatest
diff --git a/test.txt b/test.txt