fix conflig

This commit is contained in:
lonetrinity
2018-07-19 12:18:54 +08:00
parent bd3f106e05
commit 18932c03c5
+1 -3
View File
@@ -18,6 +18,4 @@ yarn-error.log
vendor/composer/autoload_static.php
vendor/composer/autoload_classmap.php
package-lock.json
*.lock
*.lock