解决冲突

kilingzhang · Mar 23, 2018 · 3c7d0fe · 3c7d0fe
1 parent cb6dee7
commit 3c7d0fe
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,4 @@
 /vendor/
 .idea
-<<<<<<< HEAD
-=======
 composer.lock
 Resopnse.md
->>>>>>> cqhttp3.0