From 259c1ef7e0ddd72c7c9ed68b1d6fcaf5f31a9e99 Mon Sep 17 00:00:00 2001
From: Nam Ki Wook <lrmuc1@gmail.com>
Date: Wed, 12 Oct 2016 17:10:41 +0900
Subject: [PATCH] Update hello.txt in develop

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

diff --git a/hello.txt b/hello.txt
index 312583e..a0cf6bf 100644
--- a/hello.txt
+++ b/hello.txt
@@ -4,3 +4,4 @@ IN PC
 =======
 Web Modify
 >>>>>>> d3dc4e74ac5c7e10c4d29f08bd29e5eab6043e17
+modify in develop
\ No newline at end of file
-- 
GitLab