"hello"
“2”
Merge branch 'master' of https://github.com/bigloong/My-Note

Conflicts:
	1.txt