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">