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'
1bccbb08 · 장진경 · b41aa7f9 · d9468878 · 1bccbb08
Commit 1bccbb08 authored 8 years ago by 장진경
--- a/hello.txt
+++ b/hello.txt
@@ -2,3 +2,4 @@ hello!
 new line
 modify by PC
 modify in GIT
+modify by branch
\ No newline at end of file