p

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