Merge branch 'develop' into 'master'

Update hello.txt Write a comment or drag your files here... See merge request !1

Merge branch 'develop' into 'master'
7efd04ea · 이인성 · 8c1e2d13 · 3a920d0f · 7efd04ea
Commit 7efd04ea authored 8 years ago by 이인성
--- a/hello.txt
+++ b/hello.txt
-<<<<<<< HEAD
-hello git
-and
-hello WEB
->>>>>>> f618069bfaae1e35814059d03b15d0b5a623c134
+modift in branch
\ No newline at end of file