冲突处理

src/views/cesium.vue

@@ -256,12 +256,7 @@ export default {
       this.initSystemInfo();
     }
     this.cityModel();
-<<<<<<< HEAD
-    this.getData(106.169866, 38.46637);
-    this.test();
-=======
     // this.getData();
->>>>>>> 91fc4bb466fdbdb8665741a74c4a6ce1f274c4a1
   },
 
   unmounted() {