chris/emacs
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fixing broken git

Browse source
This commit is contained in:
Chris Cochrun 2022-04-12 10:24:36 -05:00
parent d9ebe130da
commit ad633317f5
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
init.el
View file

@ -2097,8 +2097,6 @@ interfere with the default `bongo-playlist-buffer'."
gcmh-verbose nil)) gcmh-verbose nil))
(setq warning-suppress-types '((comp))) (setq warning-suppress-types '((comp)))
<<<<<<< HEAD
=======
(custom-set-variables (custom-set-variables
;; custom-set-variables was added by Custom. ;; custom-set-variables was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful. ;; If you edit it by hand, you could mess it up, so be careful.
@ -2116,4 +2114,3 @@ interfere with the default `bongo-playlist-buffer'."
;; Your init file should contain only one such instance. ;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right. ;; If there is more than one, they won't work right.
) )
>>>>>>> 77b1d0c4 (adding org dev pieces)