local3
master
Merge branch 'local1'

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

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

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

Conflicts:
	local1file.txt