fix(stories): conflict

2019-10-30 10:13:36 +08:00 · 2019-10-30 10:13:36 +08:00 · b2cca52f78
parent a5b77b3648 e67b444278
commit b2cca52f78
1 changed files with 5 additions and 0 deletions
--- a/stories/Layers/components/polygon3D.tsx
+++ b/stories/Layers/components/polygon3D.tsx
@ -39,6 +39,11 @@ export default class Polygon3D extends React.Component {
    });
    this.scene = scene;
    const layer = new Polygon3DLayer({});
+<<<<<<< HEAD
+=======
+
+    // TODO: new GeoJSONSource()
+>>>>>>> bda6b6cfb06193f6ae83e505a9c8667811d80a2f
    layer
      .source(await response.json())
      .size('name', [0, 10000, 50000, 30000, 100000])