From d5434fd92e0b0a81e9164f5e7640a7de9093e8b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Thu, 19 Sep 2024 15:54:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/diy/diy.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/components/diy/diy.vue b/components/diy/diy.vue
index 67d049e6..b016abf5 100644
--- a/components/diy/diy.vue
+++ b/components/diy/diy.vue
@@ -100,8 +100,6 @@
             },
         },
         methods: {
-<<<<<<< HEAD
-=======
             init() {
                 // tabs选项卡数据过滤
                 const filter_tabs_list = this.value.tabs_data;
@@ -112,7 +110,6 @@
                     });
                 }
             },
->>>>>>> dev-sws
             footer_height_computer(number) {
                 this.padding_footer_computer = number * 2;
             },