unfuck

config.el

@@ -263,13 +263,6 @@
       python-shell-interpreter-args "-i --simple-prompt")
 (setq python-shell-completion-native-disabled-interpreters '("ipython"))
 
-<<<<<<< HEAD
-=======
-(use-package! org-roam
-    :config
-    (setq org-roam-database-connector 'sqlite3))
-
->>>>>>> 8a347a9b20ba0b636f21118b8d418ea946dfd2bd
 (setq org-roam-directory (file-truename "/mnt/tenma/srv/boymind"))
 (org-roam-db-autosync-mode)
 
@@ -278,7 +271,6 @@
  '((ledger . t)
    ))
 
-<<<<<<< HEAD
 (require 'elcord)
 (elcord-mode)
 
@@ -286,8 +278,6 @@
   :config
   (setq org-roam-database-connector 'sqlite3))
 
-=======
->>>>>>> 8a347a9b20ba0b636f21118b8d418ea946dfd2bd
 (add-to-list 'org-agenda-files "/mnt/tenma/srv/boymind/20230727221433-agenda_akko.org")
 
 (setq org-roam-capture-templates '(("d" "default" plain "%?"

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)