Merge conflict

1 files changed, 0 insertions, 22 deletions

diff --git a/elpa/s-20210616.619/s-autoloads.el b/elpa/s-20210616.619/s-autoloads.el
deleted file mode 100644
index 187f6d1..0000000
--- a/elpa/s-20210616.619/s-autoloads.el
+++ /dev/null
@@ -1,22 +0,0 @@
-;;; s-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 "s" "s.el" (0 0 0 0))
-;;; Generated autoloads from s.el
-
-(register-definition-prefixes "s" '("s-"))
-
-;;;***
-
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; coding: utf-8
-;; End:
-;;; s-autoloads.el ends here