no message

FrontEnd/pages/exhibition/index.vue

@@ -562,19 +562,12 @@ export default {
         .catch((err) => {
           console.log(err);
         });
-    },
+    }, 
     async getExhibitionCard() {
 
       // this.query = this.query + "工具機";
       // console.log("getExhibitionCard"+": "+this.query)
 
-<<<<<<< HEAD
-      // this.query = this.query + "工具機";
-
-      // console.log("getExhibitionCard"+": "+this.query)
-      
-=======
->>>>>>> 221c7d61404524a69834d629a1d1430b1172e744
       await this.$axios
         .get(
           `/trending/api/Exhibition/Cards?Lang=${this.$i18n.localeProperties["langQuery"]}` +