Merge branch 'master' of http://git.nakadashi.lol/akko/doom-config

2023-08-09 14:51:01 +02:00
parent c22a39f751 8a347a9b20
commit 9fb96c18aa
6 changed files with 514 additions and 2 deletions
--- a/packages.el
+++ b/packages.el
@@ -10,8 +10,14 @@
 (package! which-key)
 (package! org-mode :recipe (:repo "https://code.orgmode.org/bzg/org-mode.git"))
 (add-to-list 'load-path "./elfiles")
+<<<<<<< HEAD

 (package! ledger-mode)
 (package! ob-ledger :recipe (:local-repo "lisp/ob-ledger"))
 (package! elcord)
+=======
+(package! ledger-mode)
+(package! ob-ledger :recipe (:local-repo "lisp/ob-ledger"))
+
+>>>>>>> 8a347a9b20ba0b636f21118b8d418ea946dfd2bd
 (package! emacsql-sqlite3)