From 0a1c21dacc75b98cc5e834bb44abe5c4ffeb3651 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=A0=84=EC=A7=84=EC=9D=BC?=
 <jeonjin-il@jeonjin-il-ui-MacBook-Air.local>
Date: Wed, 12 Oct 2016 17:49:51 +0900
Subject: [PATCH] jinil

---
 hello2.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hello2.txt b/hello2.txt
index 4789c97..30df60b 100644
--- a/hello2.txt
+++ b/hello2.txt
@@ -1,4 +1,4 @@
 pleasemidify in pc
 please
-lululala>>>>>>> b4004cdf6b409d18a5fb84f83d4aae6e04fc0407
-modify in branch
\ No newline at end of file
+lululala>>>>>>> modify by ijnil
+
-- 
GitLab