From 5bda7cba9bee0bd71726d8eed319ba6b4e138a43 Mon Sep 17 00:00:00 2001
From: Sakooooo <78461130+Sakooooo@users.noreply.github.com>
Date: Fri, 9 Aug 2024 21:22:56 +0400
Subject: [PATCH] yeah

---
 config/emacs/emacs.org | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/config/emacs/emacs.org b/config/emacs/emacs.org
index fb18f1cb..95967209 100644
--- a/config/emacs/emacs.org
+++ b/config/emacs/emacs.org
@@ -206,11 +206,6 @@ kept-old-versions 5)
   :config
   (load-theme 'doom-monokai-spectrum t))
 
-<<<<<<< HEAD
-  (use-package monokai-theme
-    :config
-    (load-theme 'monokai t))
-=======
 ;; emacsclient things
 (setq frame-resize-pixelwise t)
 ;; ui settings apparently go below