From ded1370c1c2c6fc0ef6f49602a493f90ad3144f1 Mon Sep 17 00:00:00 2001
From: DaehanK <gogoper@ajou.ac.kr>
Date: Wed, 12 Oct 2016 17:12:43 +0900
Subject: [PATCH] Update hello2.txt

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

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