添加行1
Merge branch 'master' of https://github.com/nxjcproject/gittest

Conflicts:
	test.txt