fix(layer): conflict

antvis · Mar 14, 2019 · 1f54741 · 1f54741
1 parent 550b4f1
commit 1f54741
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -8,9 +8,6 @@ node_modules/
 demos/assets/
 demos/index.html
 demos/*
-<<<<<<< HEAD
 rollup/*
 webpack/*
-=======
-src/core/three.js
->>>>>>> master
+src/core/three.js