Update README.md

hcn1519 · web-flow · commit 519cadcf8b8c · 2018-01-15T16:59:30.000+09:00
diff --git a/README.md b/README.md
@@ -26,7 +26,6 @@
 
 ### Text And Link
 ![textAndLink](images/textAndLink.gif)
-<<<<<<< HEAD
 
 ### Add Marker
 
