Minor edits

.config/emacs/config.el

@@ -720,12 +720,7 @@
     (browse-url
      (concat "https://github.com/search?l=" language
              "&type=code&q=" code))))
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-=======
->>>>>>> 67ddcb090fdcd5be954bb3af13ae6dbc236d988f
-  
+
 (defun dm-search ()
   "Search various search engines."
   (interactive)
@@ -748,7 +743,3 @@
                          ("3" "Three"))))              
       (cadr (assoc (completing-read "Choose: " completions) completions)))))
   (message "You choose `%s'" choice))
-<<<<<<< HEAD
->>>>>>> 67ddcb090fdcd5be954bb3af13ae6dbc236d988f
-=======
->>>>>>> 67ddcb090fdcd5be954bb3af13ae6dbc236d988f

.config/emacs/scripts/elpaca-setup.el

@@ -1,7 +1,7 @@
 
 ;;; Code:
 
-(defvar elpaca-installer-version 0.5)
+(defvar elpaca-installer-version 0.7)
 (defvar elpaca-directory (expand-file-name "elpaca/" user-emacs-directory))
 (defvar elpaca-builds-directory (expand-file-name "builds/" elpaca-directory))
 (defvar elpaca-repos-directory (expand-file-name "repos/" elpaca-directory))