guhongwei 2 years ago
parent
commit
df064e886c
1 changed files with 0 additions and 2 deletions
  1. 0 2
      README.md

+ 0 - 2
README.md

@@ -17,5 +17,3 @@
 1.`git config --global merge.ours.driver true`
 2.设置`.gitattributes`
 3.master 修改忽略文件,提交; 分支修改忽略文件,提交;分支合并master,提交
-
-123