Update test.txt
www
Update test.txt
Merge branch 'local1' of https://github.com/chenjunqi2014/chenlearngit into local1

Conflicts:
	test.txt
Update test.txt
local update2
Merge branch 'local1' of https://github.com/chenjunqi2014/chenlearngit into local1

Conflicts:
	test.txt
Update test.txt
local1 update *2
Merge branch 'local1' of https://github.com/chenjunqi2014/chenlearngit into local1

Conflicts:
	test.txt
local3
master
Merge branch 'local1'

Conflicts:
	test.txt
Update test.txt
sssssss.txt

sss
dfdfd
Merge branch 'local1' of https://github.com/chenjunqi2014/chenlearngit into local1

Conflicts:
	test.txt
Create svnewfile2.txt
Update test.txt
Merge branch 'local1' of https://github.com/chenjunqi2014/chenlearngit into local1

Conflicts:
	test.txt