解决Map冲突

src/components/Map.vue

@@ -9,13 +9,8 @@ export default {
     return {
       // viewer3DTiles实例《systemConfig.data3DTiles keys,tile》
       viewer3DTiles: {},
-<<<<<<< HEAD
-      // 3DTiles url集合《systemConfig.data3DTiles keys,url》
-      keysByUrl: {}
-=======
       // 3DTiles options集合《systemConfig.data3DTiles keys,options》
       keysByOptions: {},
->>>>>>> ea40ec63e9c0f3db4ef6f3cba766c6653aeda8d6
     };
   },
   mounted() {
@@ -403,14 +398,9 @@ export default {
         var tile = new SkyScenery.Cesium3DTileset(option);
         viewer.scene.primitives.add(tile);
 
-<<<<<<< HEAD
-        if (flyto) {
-          tile.readyPromise.then(function() {
-=======
         tile.readyPromise.then(function () {
           // 设置相机视角
           if (flyto) {
->>>>>>> ea40ec63e9c0f3db4ef6f3cba766c6653aeda8d6
             viewer.zoomTo(tile);
           }
         });