Change
Add
sdklf
a
Merge https://github.com/xfxyjwf/testgithub
Merge https://github.com/xfxyjwf/testgithub into test1
Merge branch 'test1'
a
Merge branch 'master' of https://github.com/xiaofeng-gg/testgithub

Conflicts:
	README.md
c