unfuck

packages.el

@@ -8,16 +8,9 @@
 
 (package! key-chord)
 (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)