Merge conflict

1 files changed, 0 insertions, 44 deletions

diff --git a/elpa/js2-highlight-vars-20170418.1829/js2-highlight-vars-autoloads.el b/elpa/js2-highlight-vars-20170418.1829/js2-highlight-vars-autoloads.el
deleted file mode 100644
index e2aa213..0000000
--- a/elpa/js2-highlight-vars-20170418.1829/js2-highlight-vars-autoloads.el
+++ /dev/null
@@ -1,44 +0,0 @@
-;;; js2-highlight-vars-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 "js2-highlight-vars" "js2-highlight-vars.el"
-;;;;;;  (0 0 0 0))
-;;; Generated autoloads from js2-highlight-vars.el
-
-(autoload 'js2-highlight-vars-mode "js2-highlight-vars" "\
-Minor mode that highlights occurrences of the variable under
-cursor in js2-mode buffers
-
-This is a minor mode.  If called interactively, toggle the
-`Js2-Highlight-vars 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 `js2-highlight-vars-mode'.
-
-The mode's hook is called both when the mode is enabled and when
-it is disabled.
-
-\(fn &optional ARG)" t nil)
-
-(register-definition-prefixes "js2-highlight-vars" '("js2-"))
-
-;;;***
-
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; coding: utf-8
-;; End:
-;;; js2-highlight-vars-autoloads.el ends here