Merge branch 'master' of github.com:aciceri/nixfleet

2022-01-24 13:58:46 +01:00 · 2022-01-24 13:58:46 +01:00 · ef8529ad34
commit ef8529ad34
parent f1da779cca 087566ed5f
3 changed files with 8 additions and 1 deletions
--- a/users/profiles/emacs/emacs.d/config/config-org.el
+++ b/users/profiles/emacs/emacs.d/config/config-org.el
@ -4,7 +4,11 @@
    (require 'org-protocol)
  :custom
  (org-startup-folded 'fold)
+<<<<<<< HEAD
  (org-startup-indented nil)
+=======
+  (org-startup-indented f)
+>>>>>>> 087566ed5f0d08df2e0b36e4c80398f5c0d26c22
  (org-agenda-files '("~/roam/" "~/orgzly~"))
  (org-ellipsis "⤵")
  (org-pretty-entities t)