Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 18:36:30 +01:00
Code Issues Packages Projects Releases Activity

fix(insert time): resolve merge conflicts

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

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

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