Merge branch 'master' of E:\xampp\htdocs\U2 with conflicts.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of E:\xampp\htdocs\U2 with conflicts.
改为gbk2312编码