Merge conflict

1 files changed, 0 insertions, 50 deletions

diff --git a/elpa/req-package-20180605.1141/req-package-autoloads.el b/elpa/req-package-20180605.1141/req-package-autoloads.el
deleted file mode 100644
index 25b04f0..0000000
--- a/elpa/req-package-20180605.1141/req-package-autoloads.el
+++ /dev/null
@@ -1,50 +0,0 @@
-;;; req-package-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-
-(add-to-list 'load-path (directory-file-name
-                         (or (file-name-directory #$) (car load-path))))
-
-
-;;;### (autoloads nil "req-package" "req-package.el" (0 0 0 0))
-;;; Generated autoloads from req-package.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "req-package" '("req-package")))
-
-;;;***
-
-;;;### (autoloads nil "req-package-args" "req-package-args.el" (0
-;;;;;;  0 0 0))
-;;; Generated autoloads from req-package-args.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "req-package-args" '("req-package-")))
-
-;;;***
-
-;;;### (autoloads nil "req-package-cycles" "req-package-cycles.el"
-;;;;;;  (0 0 0 0))
-;;; Generated autoloads from req-package-cycles.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "req-package-cycles" '("req-package-cycles-")))
-
-;;;***
-
-;;;### (autoloads nil "req-package-hooks" "req-package-hooks.el"
-;;;;;;  (0 0 0 0))
-;;; Generated autoloads from req-package-hooks.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "req-package-hooks" '("add-hook-exec" "req-package-hooks-")))
-
-;;;***
-
-;;;### (autoloads nil nil ("req-package-pkg.el") (0 0 0 0))
-
-;;;***
-
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; coding: utf-8
-;; End:
-;;; req-package-autoloads.el ends here