conflict test

d678f1c5 · minsoo713 · e3c69150 · d678f1c5
Commit d678f1c5 authored 8 years ago by minsoo713
--- a/hello.txt
+++ b/hello.txt
 hello world
 add text on pc
-edit hello.txt on gitlab
\ No newline at end of file
+edit hello.txt on gitlabnew modify on pc