Merge branch 'master' of github.com:yulqen/emacs

1 files changed, 8 insertions, 1 deletions

diff --git a/bookmarks b/bookmarks
index 159b604..2524fc0 100644
--- a/bookmarks
+++ b/bookmarks
@@ -1,4 +1,4 @@
-;;;; Emacs Bookmark Format Version 1 ;;;; -*- coding: utf-8 -*-
+;;;; Emacs Bookmark Format Version 1;;;; -*- coding: utf-8; mode: lisp-data -*-
 ;;; This format is meant to be slightly human-readable;
 ;;; nevertheless, you probably don't want to edit it.
 ;;; -*- End Of Bookmark File Format Version Stamp -*-
@@ -8,8 +8,15 @@
  (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
 )