From 99931c431b4aafd377bb37e5855ed73f046dfb19 Mon Sep 17 00:00:00 2001
From: thinkinggis <lzx199065@gmail.com>
Date: Thu, 14 Mar 2019 15:16:05 +0800
Subject: [PATCH] fix(layer): conflict

---
 .eslintignore | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.eslintignore b/.eslintignore
index e35cabbe24..9e34b3efdb 100755
--- 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
\ No newline at end of file