 (global-set-key (kbd "C-x w") 'ace-jump-word-mode)
 (global-set-key (kbd "M-SPC") 'helm-mini)
 (global-set-key (kbd "C-x o") 'switch-window)
+<<<<<<< HEAD
+
+(add-hook 'neotree-mode-hook
+          (lambda ()
+            (define-key evil-normal-state-local-map (kbd "TAB") 'neotree-enter)
+            (define-key evil-normal-state-local-map (kbd "SPC") 'neotree-enter)
+            (define-key evil-normal-state-local-map (kbd "q") 'neotree-hide)
+            (define-key evil-normal-state-local-map (kbd "RET") 'neotree-enter)))
+=======
 (global-set-key (kbd "<XF86MonBrightnessUp>")
     (lambda ()
       (interactive)

    (when (get-buffer "*Completions*") (delete-windows-on "*Completions*"))
    (abort-recursive-edit)))

(defun touchpad-off ()
  "Turn touchpad off (linux only)."
  (interactive)

  (pdf-tools-install))
(it-did-not-work)

>>>>>>> 3dc3be1... add files
;; macros
(defmacro define-and-bind-text-object (key start-regex end-regex)
  "Create new evil text object based on KEY, START-REGEX, and END-REGEX."
