|
|
|
@ -38,7 +38,6 @@
|
|
|
|
|
racer
|
|
|
|
|
helm
|
|
|
|
|
eyebrowse
|
|
|
|
|
emojify
|
|
|
|
|
;;company-mode
|
|
|
|
|
org2blog
|
|
|
|
|
pylint
|
|
|
|
@ -91,11 +90,7 @@ jlj-Packages)
|
|
|
|
|
(org-bbdb org-bibtex org-docview org-gnus org-habit org-info org-irc org-mhe org-rmail org-w3m)))
|
|
|
|
|
'(package-selected-packages
|
|
|
|
|
(quote
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
(ace-window which-key try use-package dockerfile-mode ansible yaml-mode smex twittering-mode znc eyebrowse helm racer flycheck-rust rust-mode color-theme-sanityinc-tomorrow org2blog multiple-cursors flymake-python-pyflakes pdf-tools weechat jedi python-mode pylint py-autopep8 powershell outline-magic markdown-mode magit flycheck exec-path-from-shell elpygen elpy ein doom-themes csharp-mode)))
|
|
|
|
|
=======
|
|
|
|
|
(emojify dockerfile-mode docker yaml-mode ansible smex twittering-mode znc eyebrowse helm racer flycheck-rust rust-mode color-theme-sanityinc-tomorrow org2blog multiple-cursors flymake-python-pyflakes pdf-tools weechat jedi python-mode pylint py-autopep8 powershell outline-magic markdown-mode magit flycheck exec-path-from-shell elpygen elpy ein doom-themes csharp-mode)))
|
|
|
|
|
>>>>>>> 062ecaf2c8b8ed10fb8a015d83cfbd710440d260
|
|
|
|
|
'(znc-servers
|
|
|
|
|
(\`
|
|
|
|
|
(("bouncer.awful.club" 5000 t
|
|
|
|
|