From 6c24b476c7b9ca899bf2e5ab1e98cec6bf16c9a6 Mon Sep 17 00:00:00 2001
From: Nam Ki Wook <lrmuc1@gmail.com>
Date: Wed, 12 Oct 2016 17:12:51 +0900
Subject: [PATCH] Update hello.txt

---
 hello.txt | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/hello.txt b/hello.txt
index a0cf6bf..79367d7 100644
--- a/hello.txt
+++ b/hello.txt
@@ -1,7 +1,3 @@
 hello
-<<<<<<< HEAD
 IN PC
-=======
-Web Modify
->>>>>>> d3dc4e74ac5c7e10c4d29f08bd29e5eab6043e17
 modify in develop
\ No newline at end of file
-- 
GitLab