Update README.md

shxiq01 · May 30, 2016 · 934394e · 934394e
1 parent 4947ba4
commit 934394e
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,4 @@
 # hello-word
-<<<<<<< HEAD
 helloword55555555555555555
-=======
 #helloword55555555555555555
 #feature-test
->>>>>>> parent of 42fa061... Update README.md