From 798d1a520f5f6f38fadf1b8027d3131f50f5c2f1 Mon Sep 17 00:00:00 2001 From: Kjetil Orbekk Date: Fri, 13 May 2022 11:07:37 -0400 Subject: fix config --- emacs/.doom.d/config.el | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'emacs/.doom.d') diff --git a/emacs/.doom.d/config.el b/emacs/.doom.d/config.el index 0aeb010..fbace34 100644 --- a/emacs/.doom.d/config.el +++ b/emacs/.doom.d/config.el @@ -241,21 +241,13 @@ (setq org-capture-templates `(("g" "Go to current journal entry" plain (function kj/org-journal-find-location) "%i%?" :jump-to-captured t :immediate-finish t) -<<<<<<< HEAD - ("t" "Create a TODO in current journal entry" plain (function kj/org-journal-narrowed-location) + ("t" "Create a TODO" entry (file+headline "~/org/roam/tasks.org" "Inbox") "** TODO %?\n%i\n%a") ("w" "Log bodyweight" table-line (file+headline ,(concat org-roam-directory "bodyweight.org") "Body weight log") "| %t | %^{Weight} | |" :prepend t :immediate-finish t))) -||||||| parent of e40f80f (config) - ("t" "Create a TODO in current journal entry" plain (function kj/org-journal-narrowed-location) - "** TODO %?\n%i\n%a"))) -======= - ("t" "Create a TODO" entry (file+headline "~/org/roam/tasks.org" "Inbox") - "** TODO %?\n%i\n%a"))) ->>>>>>> e40f80f (config) (defun kj/find-agenda-files-containing-tag (tag) (setq org-agenda-archives-mode nil) -- cgit v1.2.3