From 15a4f5c5acaa54adf79a657d7e1b1c3a19906f8c Mon Sep 17 00:00:00 2001
From: leekyungha <dgre1034@ajou.ac.kr>
Date: Wed, 12 Oct 2016 17:47:57 +0900
Subject: [PATCH] dd

---
 hello.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hello.txt b/hello.txt
index 3d32ae5..993d200 100644
--- a/hello.txt
+++ b/hello.txt
@@ -1,4 +1,4 @@
-hello world
+difdodfhfhello world
 <<<<<<< HEAD
 in git
 =======
-- 
GitLab