Merge conflict

1 files changed, 0 insertions, 128 deletions

diff --git a/elpa/evil-20220510.2302/evil-autoloads.el b/elpa/evil-20220510.2302/evil-autoloads.el
deleted file mode 100644
index fb58c6a..0000000
--- a/elpa/evil-20220510.2302/evil-autoloads.el
+++ /dev/null
@@ -1,128 +0,0 @@
-;;; evil-autoloads.el --- automatically extracted autoloads  -*- lexical-binding: t -*-
-;;
-;;; Code:
-
-(add-to-list 'load-path (directory-file-name
-                         (or (file-name-directory #$) (car load-path))))
-
-
-;;;### (autoloads nil "evil-command-window" "evil-command-window.el"
-;;;;;;  (0 0 0 0))
-;;; Generated autoloads from evil-command-window.el
-
-(register-definition-prefixes "evil-command-window" '("evil-"))
-
-;;;***
-
-;;;### (autoloads nil "evil-commands" "evil-commands.el" (0 0 0 0))
-;;; Generated autoloads from evil-commands.el
-
-(register-definition-prefixes "evil-commands" '("evil-"))
-
-;;;***
-
-;;;### (autoloads nil "evil-common" "evil-common.el" (0 0 0 0))
-;;; Generated autoloads from evil-common.el
-
-(register-definition-prefixes "evil-common" '("bounds-of-evil-" "evil-" "forward-evil-"))
-
-;;;***
-
-;;;### (autoloads nil "evil-core" "evil-core.el" (0 0 0 0))
-;;; Generated autoloads from evil-core.el
- (autoload 'evil-mode "evil" nil t)
-
-(register-definition-prefixes "evil-core" '("evil-" "turn-o"))
-
-;;;***
-
-;;;### (autoloads nil "evil-digraphs" "evil-digraphs.el" (0 0 0 0))
-;;; Generated autoloads from evil-digraphs.el
-
-(register-definition-prefixes "evil-digraphs" '("evil-digraph"))
-
-;;;***
-
-;;;### (autoloads nil "evil-ex" "evil-ex.el" (0 0 0 0))
-;;; Generated autoloads from evil-ex.el
-
-(register-definition-prefixes "evil-ex" '("evil-"))
-
-;;;***
-
-;;;### (autoloads nil "evil-integration" "evil-integration.el" (0
-;;;;;;  0 0 0))
-;;; Generated autoloads from evil-integration.el
-
-(register-definition-prefixes "evil-integration" '("evil-"))
-
-;;;***
-
-;;;### (autoloads nil "evil-jumps" "evil-jumps.el" (0 0 0 0))
-;;; Generated autoloads from evil-jumps.el
-
-(register-definition-prefixes "evil-jumps" '("evil-"))
-
-;;;***
-
-;;;### (autoloads nil "evil-macros" "evil-macros.el" (0 0 0 0))
-;;; Generated autoloads from evil-macros.el
-
-(register-definition-prefixes "evil-macros" '("evil-"))
-
-;;;***
-
-;;;### (autoloads nil "evil-maps" "evil-maps.el" (0 0 0 0))
-;;; Generated autoloads from evil-maps.el
-
-(register-definition-prefixes "evil-maps" '("evil-"))
-
-;;;***
-
-;;;### (autoloads nil "evil-repeat" "evil-repeat.el" (0 0 0 0))
-;;; Generated autoloads from evil-repeat.el
-
-(register-definition-prefixes "evil-repeat" '("evil-"))
-
-;;;***
-
-;;;### (autoloads nil "evil-search" "evil-search.el" (0 0 0 0))
-;;; Generated autoloads from evil-search.el
-
-(register-definition-prefixes "evil-search" '("evil-"))
-
-;;;***
-
-;;;### (autoloads nil "evil-states" "evil-states.el" (0 0 0 0))
-;;; Generated autoloads from evil-states.el
-
-(register-definition-prefixes "evil-states" '("evil-"))
-
-;;;***
-
-;;;### (autoloads nil "evil-types" "evil-types.el" (0 0 0 0))
-;;; Generated autoloads from evil-types.el
-
-(register-definition-prefixes "evil-types" '("evil-ex-get-optional-register-and-count"))
-
-;;;***
-
-;;;### (autoloads nil "evil-vars" "evil-vars.el" (0 0 0 0))
-;;; Generated autoloads from evil-vars.el
-
-(register-definition-prefixes "evil-vars" '("evil-"))
-
-;;;***
-
-;;;### (autoloads nil nil ("evil-development.el" "evil-keybindings.el"
-;;;;;;  "evil-pkg.el" "evil.el") (0 0 0 0))
-
-;;;***
-
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; coding: utf-8
-;; End:
-;;; evil-autoloads.el ends here