Merge conflict

1 files changed, 0 insertions, 81 deletions

diff --git a/elpa/yasnippet-20200604.246/yasnippet-autoloads.el b/elpa/yasnippet-20200604.246/yasnippet-autoloads.el
deleted file mode 100644
index fc8fcd9..0000000
--- a/elpa/yasnippet-20200604.246/yasnippet-autoloads.el
+++ /dev/null
@@ -1,81 +0,0 @@
-;;; yasnippet-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 "yasnippet" "yasnippet.el" (0 0 0 0))
-;;; Generated autoloads from yasnippet.el
-
-(autoload 'yas-minor-mode "yasnippet" "\
-Toggle YASnippet mode.
-
-This is a minor mode.  If called interactively, toggle the `yas
-minor mode' mode.  If the prefix argument is positive, enable the
-mode, and if it is zero or negative, disable the mode.
-
-If called from Lisp, toggle the mode if ARG is `toggle'.  Enable
-the mode if ARG is nil, omitted, or is a positive number.
-Disable the mode if ARG is a negative number.
-
-To check whether the minor mode is enabled in the current buffer,
-evaluate `yas-minor-mode'.
-
-The mode's hook is called both when the mode is enabled and when
-it is disabled.
-
-When YASnippet mode is enabled, `yas-expand', normally bound to
-the TAB key, expands snippets of code depending on the major
-mode.
-
-With no argument, this command toggles the mode.
-positive prefix argument turns on the mode.
-Negative prefix argument turns off the mode.
-
-Key bindings:
-\\{yas-minor-mode-map}
-
-\(fn &optional ARG)" t nil)
-
-(put 'yas-global-mode 'globalized-minor-mode t)
-
-(defvar yas-global-mode nil "\
-Non-nil if Yas-Global mode is enabled.
-See the `yas-global-mode' command
-for a description of this minor mode.
-Setting this variable directly does not take effect;
-either customize it (see the info node `Easy Customization')
-or call the function `yas-global-mode'.")
-
-(custom-autoload 'yas-global-mode "yasnippet" nil)
-
-(autoload 'yas-global-mode "yasnippet" "\
-Toggle Yas minor mode in all buffers.
-With prefix ARG, enable Yas-Global mode if ARG is positive; otherwise,
-disable it.
-
-If called from Lisp, toggle the mode if ARG is `toggle'.
-Enable the mode if ARG is nil, omitted, or is a positive number.
-Disable the mode if ARG is a negative number.
-
-Yas minor mode is enabled in all buffers where `yas-minor-mode-on'
-would do it.
-
-See `yas-minor-mode' for more information on Yas minor mode.
-
-\(fn &optional ARG)" t nil)
-(autoload 'snippet-mode "yasnippet" "A mode for editing yasnippets" t nil)
-
-(register-definition-prefixes "yasnippet" '("help-snippet-def" "snippet-mode-map" "yas"))
-
-;;;***
-
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; coding: utf-8
-;; End:
-;;; yasnippet-autoloads.el ends here