From f63b8c86b943cab5b830429bbf9b397f3211a467 Mon Sep 17 00:00:00 2001
From: "DESKTOP-FUS91B7\\Showeasy" <fred870421@gmail.com>
Date: Fri, 10 Mar 2023 13:50:33 +0800
Subject: [PATCH] no message

---
 FrontEnd/pages/exhibition/index.vue | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/FrontEnd/pages/exhibition/index.vue b/FrontEnd/pages/exhibition/index.vue
index 339cd0a..3bb4017 100644
--- a/FrontEnd/pages/exhibition/index.vue
+++ b/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"]}` +