changes2
tijiao
冲突测试1
冲突测试master1
解决冲突 Merge branch 'branch1'

Conflicts:
	src/com/gitdemo/test/readme.txt