commit conflic

85256694 · minsoo713 · d678f1c5 · 1b12475b · 85256694
Commit 85256694 authored 8 years ago by minsoo713
--- a/hello.txt
+++ b/hello.txt
 hello world
 add text on pc
+
 edit hello.txt on gitlabnew modify on pc
+hi hello on gitlab ++