1

src/views/modules/load-data/index.vue

@@ -247,7 +247,6 @@
 </template>
 
 <script>
-<<<<<<< HEAD
 	import * as echarts from 'echarts'
 	import chinaJson from "@/components/echarts/china.json";
 	import axios from 'axios';