解決衝突

2 years ago · f388e9a6ae
1 changed files with 0 additions and 8 deletions
--- a/FrontEnd/pages/exhibition/index.vue
+++ b/FrontEnd/pages/exhibition/index.vue
@ -567,14 +567,6 @@ export default {

      // 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"]}` +