Missed a merge area
This commit is contained in:
parent
9a808da2db
commit
52ca5dd236
1 changed files with 5 additions and 13 deletions
14
emacs/.emacs
14
emacs/.emacs
|
@ -139,17 +139,9 @@
|
|||
(evil-mode 1)
|
||||
(setq evil-ex-substitute-global t)
|
||||
(define-key evil-normal-state-map "/" 'swiper)
|
||||
<<<<<<< HEAD
|
||||
(define-key evil-motion-state-map [down-mouse-1] 'silence)
|
||||
(define-key evil-motion-state-map [mouse-1] 'silence)
|
||||
(setq-default evil-cross-lines t))
|
||||
=======
|
||||
(setq-default evil-cross-lines t)
|
||||
(define-key evil-insert-state-map (kbd "<up>") 'nope)
|
||||
(define-key evil-insert-state-map (kbd "<left>") 'nope)
|
||||
(define-key evil-insert-state-map (kbd "<right>") 'nope)
|
||||
(define-key evil-insert-state-map (kbd "<down>") 'nope))
|
||||
>>>>>>> 88de92aa599c6c9f35ce00728ce948fcd63e5682
|
||||
(define-key evil-motion-state-map [down-mouse-1] 'silence)
|
||||
(define-key evil-motion-state-map [mouse-1] 'silence)
|
||||
(setq-default evil-cross-lines t))
|
||||
|
||||
;; Auto-Complete
|
||||
(use-package auto-complete
|
||||
|
|
Loading…
Reference in a new issue