From 0a902d3acbceb9b386b17945925bd0d972a08aab Mon Sep 17 00:00:00 2001
From: Janie <109517022+Janie06@users.noreply.github.com>
Date: Fri, 10 Mar 2023 13:45:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E6=B1=BA=E8=A1=9D=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 FrontEnd/pages/exhibition/index.vue | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/FrontEnd/pages/exhibition/index.vue b/FrontEnd/pages/exhibition/index.vue
index 339cd0a..443fc95 100644
--- a/FrontEnd/pages/exhibition/index.vue
+++ b/FrontEnd/pages/exhibition/index.vue
@@ -564,17 +564,6 @@ export default {
         });
     },
     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"]}` +