Bob 在 text.txt 加入 Bob
Merge branch 'master' of github.com:kdr130/GitTest

Conflicts:
	text.txt