From 63b1463150d0239cc66eccd011b2f6529fe72f5e Mon Sep 17 00:00:00 2001
From: Konstantinos Kaloutas <konstantinos@logseq.com>
Date: Fri, 19 May 2023 11:57:39 +0300
Subject: [PATCH] fix: conflicts

---
 src/main/frontend/dicts/en.cljc | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/frontend/dicts/en.cljc b/src/main/frontend/dicts/en.cljc
index 24b428e3bf..6c77be823a 100644
--- a/src/main/frontend/dicts/en.cljc
+++ b/src/main/frontend/dicts/en.cljc
@@ -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"}})
\ No newline at end of file
+    :dev/show-page-ast               "(Dev) Show page AST"}})