From 13232fe3481d0e3e89d5fefe2b332e3c457782bc Mon Sep 17 00:00:00 2001
From: leekyungha <dgre1034@ajou.ac.kr>
Date: Wed, 12 Oct 2016 17:54:48 +0900
Subject: [PATCH] dd

---
 hello.txt | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/hello.txt b/hello.txt
index 3d32ae5..9712840 100644
--- a/hello.txt
+++ b/hello.txt
@@ -1,7 +1,12 @@
 hello world
 <<<<<<< HEAD
 in git
-=======
+======dfsfsdffddf=
+i
 web
 >>>>>>> 53ed6f61209f7d77b77b3d2df0704090117fcc3b
-i'm branch2
+fdfdfdf
+dfdf
+df
+sdf
+di'm branch2
-- 
GitLab