From b0df9abdbb3668a4bf74a2ee5d6a9fb64a265e11 Mon Sep 17 00:00:00 2001
From: kyoerae yeom <duarufp@ajou.ac.kr>
Date: Wed, 12 Oct 2016 17:16:33 +0900
Subject: [PATCH] Update hello.txt

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

diff --git a/hello.txt b/hello.txt
index 4884e2c..5d94b17 100644
--- a/hello.txt
+++ b/hello.txt
@@ -3,3 +3,4 @@ open source
 =======
 hello babies, girls, boys.
 >>>>>>> 0e05e8325dc5ffc042cd4cf25d2f50add831bf5e
+modify in branch "develop"
\ No newline at end of file
-- 
GitLab