From a88815cf6b9f0446f167ec4870089a001f25e026 Mon Sep 17 00:00:00 2001
From: SiriusXT <1160925501@qq.com>
Date: Wed, 4 Jun 2025 16:53:36 +0800
Subject: [PATCH] fix(insert time): resolve merge conflicts

---
 apps/client/src/widgets/type_widgets/ckeditor/config.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/apps/client/src/widgets/type_widgets/ckeditor/config.ts b/apps/client/src/widgets/type_widgets/ckeditor/config.ts
index a162e2d6e..210fac3bf 100644
--- a/apps/client/src/widgets/type_widgets/ckeditor/config.ts
+++ b/apps/client/src/widgets/type_widgets/ckeditor/config.ts
@@ -244,11 +244,7 @@ export function buildFloatingToolbar() {
             {
                 label: "Insert",
                 icon: "plus",
-<<<<<<< HEAD
                 items: ["bookmark", "internallink", "includeNote", "|", "math", "mermaid", "horizontalLine", "pageBreak", "dateTime"]
-=======
-                items: ["bookmark", "internallink", "includeNote", "|", "math", "mermaid", "horizontalLine", "pageBreak"]
->>>>>>> develop
             },
             "|",
             "outdent",