From f435ac492063f3793453eb8ad179165cc2c3be3c Mon Sep 17 00:00:00 2001 From: KimJeongwook <rkrn6131@ajou.ac.kr> Date: Wed, 12 Oct 2016 17:52:45 +0900 Subject: [PATCH] Update hello.txt --- hello.txt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/hello.txt b/hello.txt index 8c88889..3d32ae5 100644 --- a/hello.txt +++ b/hello.txt @@ -1,7 +1,4 @@ -difdodfhpiweognroibnikenladnb -asfdobpdbndlkbnb -OBNDFAKLBF -FSBSFKLBNFBfhello world +hello world <<<<<<< HEAD in git ======= -- GitLab