fix(layer): conflict

This commit is contained in:
thinkinggis 2019-03-14 15:16:05 +08:00
parent f8737ba6d1
commit eca60bb4f4
1 changed files with 1 additions and 4 deletions

View File

@ -8,9 +8,6 @@ node_modules/
demos/assets/
demos/index.html
demos/*
<<<<<<< HEAD
rollup/*
webpack/*
=======
src/core/three.js
>>>>>>> master