mirror of https://gitee.com/antv-l7/antv-l7
fix(layer): conflict
This commit is contained in:
parent
f8737ba6d1
commit
eca60bb4f4
|
@ -8,9 +8,6 @@ node_modules/
|
|||
demos/assets/
|
||||
demos/index.html
|
||||
demos/*
|
||||
<<<<<<< HEAD
|
||||
rollup/*
|
||||
webpack/*
|
||||
=======
|
||||
src/core/three.js
|
||||
>>>>>>> master
|
||||
|
|
Loading…
Reference in New Issue