From d678f1c58abaaeba6aab011041d478a6c9da2ba0 Mon Sep 17 00:00:00 2001
From: minsoo713 <eldkfwkd4730@naver.com>
Date: Wed, 12 Oct 2016 17:04:23 +0900
Subject: [PATCH] conflict test

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

diff --git a/hello.txt b/hello.txt
index ff8543c..4e4da94 100644
--- a/hello.txt
+++ b/hello.txt
@@ -1,3 +1,3 @@
 hello world
 add text on pc
-edit hello.txt on gitlab
\ No newline at end of file
+edit hello.txt on gitlabnew modify on pc
-- 
GitLab