From 9366ca8f2c20cf57b2b049e36dace5635c25819b Mon Sep 17 00:00:00 2001
From: herenshan112 <herenshan112@163.com>
Date: Fri, 12 Apr 2024 16:02:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DesignForm/layoutPage/index.vue | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/components/DesignForm/layoutPage/index.vue b/src/components/DesignForm/layoutPage/index.vue
index bdec0d6b3..a6dd050ac 100644
--- a/src/components/DesignForm/layoutPage/index.vue
+++ b/src/components/DesignForm/layoutPage/index.vue
@@ -104,11 +104,7 @@
     </script>
     <template>
         <div class="jhk_kjh">
-<<<<<<< HEAD
-       
-=======
-        
->>>>>>> 6338ac16bfc9e995c1a39aed0598c3aefb93bace
+
             <el-collapse v-model="activeName" accordion>
     
                 <el-collapse-item title="边框设置" name="1">