添加一个reademe.md
ceshi
测试冲突操作
aaa
aa
Merge branch 'master' of code.csdn.net:kongjiea/jsnote

Conflicts:
	ceshi.txt
测试为代码
qqq
Merge branch 'master' of code.csdn.net:kongjiea/jsnote

Conflicts:
	ceshi.txt
删除
删除
Merge branch 'master' of code.csdn.net:kongjiea/jsnote

Conflicts:
	ceshi.txt
修改内容
xnr
Merge branch 'master' of code.csdn.net:kongjiea/jsnote

Conflicts:
	ceshi.txt
111
111
11111
Merge branch 'master' of github.com:kongjiea/jsNote
111