diff --git a/server/resource/package/web/view/table.vue.tpl b/server/resource/package/web/view/table.vue.tpl
index d73e97aa2..07aaf4162 100644
--- a/server/resource/package/web/view/table.vue.tpl
+++ b/server/resource/package/web/view/table.vue.tpl
@@ -332,8 +332,6 @@ const searchRule = reactive({
   {{- end }}
 })
 
-=======
->>>>>>> main
 const elFormRef = ref()
 const elSearchFormRef = ref()