冲突
update conflict
Merge pull request #6 from chengyuan9826/master

欢迎@chengyuan9826掌握Git,一起开始新项目在GitHub
删除了点东西
Merge pull request #8 from chengyuan9826/dev

Dev
Merge pull request #7 from chengyuan9826/master

update
Merge pull request #9 from lisongyu/master

怎么回事
Revert "怎么回事"
Merge pull request #10 from strivek/revert-9-master

Revert "怎么回事"
Merge pull request #11 from chengyuan9826/master

更改
Merge pull request #12 from chengyuan9826/master

Update ss2.html  18:33
Merge branch 'master' of https://github.com/strivek/training