From ad633317f54806c69571ad6b8aa47038c707a01f Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Tue, 12 Apr 2022 10:24:36 -0500 Subject: [PATCH] fixing broken git --- init.el | 3 --- 1 file changed, 3 deletions(-) diff --git a/init.el b/init.el index 6720cacf..4451f6fc 100644 --- a/init.el +++ b/init.el @@ -2097,8 +2097,6 @@ interfere with the default `bongo-playlist-buffer'." gcmh-verbose nil)) (setq warning-suppress-types '((comp))) -<<<<<<< HEAD -======= (custom-set-variables ;; custom-set-variables was added by Custom. ;; 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. ;; If there is more than one, they won't work right. ) ->>>>>>> 77b1d0c4 (adding org dev pieces)