Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-03 20:06:08 +01:00
Code Issues Packages Projects Releases Activity

feat(insert time):fix: resolve merge conflicts

Browse Source
This commit is contained in:
SiriusXT
2025-06-04 16:50:36 +08:00
parent 3cdee1ac86
commit 8b8969f6e9
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/client/src/widgets/type_widgets/ckeditor/config.ts
View File

@@ -244,7 +244,11 @@ export function buildFloatingToolbar() {
{
label: "Insert",
icon: "plus",
items: ["internallink", "includeNote", "|", "math", "mermaid", "horizontalLine", "pageBreak", "dateTime"]
<<<<<<< HEAD
items: ["bookmark", "internallink", "includeNote", "|", "math", "mermaid", "horizontalLine", "pageBreak", "dateTime"]
=======
items: ["bookmark", "internallink", "includeNote", "|", "math", "mermaid", "horizontalLine", "pageBreak"]
>>>>>>> develop
},
"|",
"outdent",