jowj/chd
1
0
Fork 0
Code Pull Requests Releases Activity

Remove the duplicate issues created during the merge.

Browse Source 
- hoisted by my own merge.
This commit is contained in:
jowj 2019-06-05 16:09:36 -05:00
parent 0e0dbfd32a
commit 83ccff34df
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
applicationConfiguration/.emacs/init.el
View File

@ -38,7 +38,6 @@
racer racer
helm helm
eyebrowse eyebrowse
emojify
;;company-mode ;;company-mode
org2blog org2blog
pylint 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))) (org-bbdb org-bibtex org-docview org-gnus org-habit org-info org-irc org-mhe org-rmail org-w3m)))
'(package-selected-packages '(package-selected-packages
(quote (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))) (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 '(znc-servers
(\` (\`
(("bouncer.awful.club" 5000 t (("bouncer.awful.club" 5000 t