updates

doom/config.el

@@ -80,12 +80,9 @@
   (setq lsp-pyls-plugins-pyflakes-enabled t)
 )
 
-<<<<<<< HEAD
 (after! lsp-python-ms
   (set-lsp-priority! 'mspyls 1))
 
-=======
->>>>>>> dfea492 (updates)
 (add-hook 'org-mode-hook #'org-bullets-mode)
 
 (add-hook 'before-save-hook 'py-isort-before-save)
@@ -120,7 +117,6 @@ was updated after pytest was run then nothing is reported.
  'org-babel-load-languages
  '((python . t)))
 
-<<<<<<< HEAD
 
 (setq projectile-project-search-path '("~/Projects/" "~/Work/Projects/"))
 
@@ -139,5 +135,4 @@ was updated after pytest was run then nothing is reported.
   :defer t ; don't access `dired-mode-map' until `peep-dired' is loaded
   :bind (:map dired-mode-map
               ("P" . peep-dired)))
-=======
->>>>>>> dfea492 (updates)
+

doom/init.el

@@ -152,11 +152,7 @@
        ;;php               ; perl's insecure younger brother
        ;;plantuml          ; diagrams for confusing people more
        ;;purescript        ; javascript, but functional
-<<<<<<< HEAD
        (python +lsp +pyenv)            ; beautiful is better than ugly
-=======
-       (python +lsp)            ; beautiful is better than ugly
->>>>>>> dfea492 (updates)
        ;;qt                ; the 'cutest' gui framework ever
        ;;racket            ; a DSL for DSLs
        ;;raku              ; the artist formerly known as perl6

doom/packages.el

@@ -58,8 +58,6 @@
 (package! ein)
 (package! python-docstring)
 (package! py-autopep8)
-<<<<<<< HEAD
+
 (package! diredfl)
 (package! peep-dired)
-=======
->>>>>>> dfea492 (updates)