summaryrefslogtreecommitdiffstats
path: root/bookmarks
diff options
context:
space:
mode:
authorMatthew Lemon <matt@matthewlemon.com>2022-11-29 19:59:43 +0000
committerMatthew Lemon <matt@matthewlemon.com>2022-11-29 19:59:43 +0000
commit759a4bbce2f852b5e29a9d37f29bb23a8a5737ee (patch)
tree43ec676a412f2467d91d40a90e6d845f612202c0 /bookmarks
parentf42c89b5b241926fbaab592e6e1063a603dc753c (diff)
bookmarks and font
Diffstat (limited to 'bookmarks')
-rw-r--r--bookmarks7
1 files changed, 0 insertions, 7 deletions
diff --git a/bookmarks b/bookmarks
index 2524fc0..815ccd5 100644
--- a/bookmarks
+++ b/bookmarks
@@ -8,15 +8,8 @@
(rear-context-string . ": home\n\n* Tasks\n")
(position . 119))
("org-capture-last-stored"
-<<<<<<< HEAD
(filename . "~/org/refile.org")
(front-context-string . "** TODO Review E")
(rear-context-string . "1-27 Sun 15:05]\n")
(position . 639))
-=======
- (filename . "~/org/home.org")
- (front-context-string . "** TODO Get blue")
- (rear-context-string . ": home\n\n* Tasks\n")
- (position . 119))
->>>>>>> 81a4e8c58baff24a49e1b4392ec9ee6906f88047
)