From 6a7eb488a172b80f8a262833af5ad09744004848 Mon Sep 17 00:00:00 2001 From: pixelmaxQM Date: Sat, 28 Jun 2025 22:09:06 +0800 Subject: [PATCH] fix: remove merge conflict markers from table.vue.tpl --- server/resource/package/web/view/table.vue.tpl | 2 -- 1 file changed, 2 deletions(-) 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()