conf

2018-03-15 11:00:55 +08:00
parent beacc31ebf
commit c7412bb437
2 changed files with 3 additions and 4 deletions
@@ -1,7 +1,4 @@
-<<<<<<< HEAD
 git submodule update --init --recursive
-=======
 git fetch --all  
 git reset --hard origin/master 
 git pull
->>>>>>> 70752a4e25d402dfc5a853164331ec9601d63a78