From 759a4bbce2f852b5e29a9d37f29bb23a8a5737ee Mon Sep 17 00:00:00 2001
From: Matthew Lemon <matt@matthewlemon.com>
Date: Tue, 29 Nov 2022 19:59:43 +0000
Subject: bookmarks and font

---
 bookmarks | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'bookmarks')

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
 )
-- 
cgit v1.2.3