fiddlerwoaroof/dotfiles - Change MPV56DW5NAXS6L6VCGVVRZU4HYDMVW6QUQ2I5ZVYXWZRUS4WLWRAC

fix merge conflicts

Created by fiddlerwoaroof on July 2, 2017

MPV56DW5NAXS6L6VCGVVRZU4HYDMVW6QUQ2I5ZVYXWZRUS4WLWRAC

Dependencies

In channels

main

Change contents

Replacement in emacs at line 75 [5.82]

∅:D[3.144] → [4.240:348]

B:BD[4.240] → [4.240:348]

  (setq slime-contribs  '(slime-fancy slime-company slime-macrostep slime-trace-dialog slime-mdot-fu ))
  )

[3.144]

[4.348]

  (setq slime-contribs
	'(slime-fancy
	  slime-company
	  slime-macrostep
	  slime-trace-dialog
	  slime-mdot-fu)))

Replacement in emacs at line 99 [5.82]

B:BD[4.855] → [4.855:1131]

  (setq company-backends '(company-clang company-bbdb company-nxml company-css
					 company-xcode company-cmake company-capf company-files
					 (company-dabbrev-code company-gtags company-etags
							       company-keywords) company-oddmuse
							       company-dabbrev))

[4.855]

[4.1131]

  (setq company-backends
	'(company-clang
	  company-bbdb
	  company-nxml
	  company-css
	  company-xcode
	  company-cmake
	  company-capf
	  company-files
	  (company-dabbrev-code
	   company-gtags
	   company-etags
	   company-keywords)
	  company-oddmuse
	  company-dabbrev))

Insertion in emacs at line 180 [5.82]

[3.198]

(use-package evil-nerd-commenter
  :ensure t
  :config
  (evilnc-default-hotkeys t))

Deletion in emacs at line 303 [5.82]
B:BD[5.3486] → [5.3486:3520]
B:BD[5.3520] → [6.256:278]
B:BD[6.278] → [2.48038:48068]
```
(use-package evil-nerd-commenter
  :ensure t
  :config
  (evilnc-default-hotkeys t))
```

Replacement in emacs at line 401 [5.82]

B:BD[5.10710] → [7.83:341]

 '(default ((t (:family "Source Code Pro" :foundry "adobe" :slant normal :weight semi-bold :height 113 :width normal))))
 '(rainbow-delimiters-depth-1-face ((t (:foreground "color-238"))))
 '(rainbow-delimiters-depth-2-face ((t (:foreground "color-235")))))

[5.10710]

[5.10968]

 '(default ((t (:family "Source Code Pro" :foundry "adobe" :slant normal :weight semi-bold :height 113 :width normal)))))