From f388e9a6ae81157aa75acc8694fd1284e365b6b4 Mon Sep 17 00:00:00 2001
From: 18300102974 <tony.lin@origtek.cn>
Date: Fri, 10 Mar 2023 13:54:12 +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 | 8 --------
 1 file changed, 8 deletions(-)

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