Fix the conflict again

2018-11-24 16:56:52 +08:00
parent 1811f20a14
commit b346f7fec9
27 changed files with 0 additions and 230 deletions
--- a/3
+++ b/3
@@ -73,10 +73,7 @@ cleandoc:

 submodules:
 	@git submodule update --init
-<<<<<<< HEAD
-=======

->>>>>>> origin/develop
 .PHONY: submodules

 # init