From 3a920d0f0c138ff785ed5f19633812a13ab912c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=9D=B4=EC=9D=B8=EC=84=B1?= <dlstjd0117@ajou.ac.kr>
Date: Wed, 12 Oct 2016 17:10:21 +0900
Subject: [PATCH] Update hello.txt

---
 hello.txt | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/hello.txt b/hello.txt
index 9b94ced..fdd5143 100644
--- a/hello.txt
+++ b/hello.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-hello git
-and
-hello WEB
->>>>>>> f618069bfaae1e35814059d03b15d0b5a623c134
+modift in branch
\ No newline at end of file
-- 
GitLab