删除的一点问题
Merge branch 'master' of github.com:JetMuffin/PicServer
merge