Update hello.txt

b0df9abd · kyoerae yeom · 6acde5c5 · b0df9abd
Commit b0df9abd authored 8 years ago by kyoerae yeom
--- a/hello.txt
+++ b/hello.txt
@@ -3,3 +3,4 @@ open source
 =======
 hello babies, girls, boys.
 >>>>>>> 0e05e8325dc5ffc042cd4cf25d2f50add831bf5e
+modify in branch "develop"
\ No newline at end of file