add the general package

init.org

@@ -362,6 +362,8 @@ It provides a minor-mode
 (report-time-since-load "Editor Features")
 #+END_SRC
 
+
+
 ** Evil Vim Keybindings
 
 I configure all my apps to use vim keybindings if possible to maximise
@@ -371,7 +373,6 @@ muscle memory.
   ;; some provided automations
   (crafted-evil-discourage-arrow-keys)
   (crafted-evil-vim-muscle-memory)
-
 #+END_SRC
 
 #+BEGIN_SRC emacs-lisp
@@ -1078,7 +1079,12 @@ gicrisf has [[https://github.com/gicrisf/ox-zola][created a package]] to export
 #+END_SRC
 
 #+RESULTS:
+<<<<<<< HEAD
 : [nil 26302 34728 837190 nil elpaca-process-queues nil nil 651000 nil]
+||||||| parent of 48b03fc (add the general package)
+: [nil 26301 59789 776924 nil elpaca-process-queues nil nil 824000 nil]
+=======
+>>>>>>> 48b03fc (add the general package)
 
 It is a wrapper around ~ox-hugo~ to export org files to Zola. It
 supports most features of it and directs the user to the [[https://ox-hugo.scripter.co/][the hugo