From 9dc12d37a08dfb05d54ddd0e63c1144a3400a474 Mon Sep 17 00:00:00 2001
From: KimJeongwook <rkrn6131@ajou.ac.kr>
Date: Wed, 12 Oct 2016 17:15:18 +0900
Subject: [PATCH] Update hello.txt

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

diff --git a/hello.txt b/hello.txt
index d73d74e..3d32ae5 100644
--- a/hello.txt
+++ b/hello.txt
@@ -4,3 +4,4 @@ in git
 =======
 web
 >>>>>>> 53ed6f61209f7d77b77b3d2df0704090117fcc3b
+i'm branch2
-- 
GitLab