fix: conflicts

This commit is contained in:
Konstantinos Kaloutas
2023-05-19 11:57:39 +03:00
parent 625c5c0161
commit 63b1463150

View File

@@ -256,7 +256,11 @@
:whiteboard/link-whiteboard-or-block "Link whiteboard/page/block"
:page-search "Search in the current page"
:graph-search "Search graph"
:home "Home"
:page "Page"
:new-page "New page"
:whiteboard "Whiteboard"
:whiteboards "Whiteboards"
:new-whiteboard "New whiteboard"
:new-graph "Add new graph"
:graph "Graph"
@@ -541,4 +545,4 @@
:dev/show-block-data "(Dev) Show block data"
:dev/show-block-ast "(Dev) Show block AST"
:dev/show-page-data "(Dev) Show page data"
:dev/show-page-ast "(Dev) Show page AST"}})
:dev/show-page-ast "(Dev) Show page AST"}})