diff --git a/src/views/lowdesign/reportDesign/index.vue b/src/views/lowdesign/reportDesign/index.vue
index 87df5ff..4a5bddc 100644
--- a/src/views/lowdesign/reportDesign/index.vue
+++ b/src/views/lowdesign/reportDesign/index.vue
@@ -354,10 +354,6 @@ const tableFormVerify = (type) => {
         let tabKey = 'mysql'
         // 子字段不能再包含子字段
         if (item.isSubField && item.hasChildren === 'Y') {
-<<<<<<< HEAD
-          
-=======
->>>>>>> e33fcb33fe4b8f77c8e4cfa9784af83018966c04
           messageText = `<div style="line-height:24px">
               <div>子字段不能包含子字段</div>
               <div>序号：${index + 1}</div>