From 9109c61e41d17d4a9ff81668194637a166babb25 Mon Sep 17 00:00:00 2001
From: Sakooooo <78461130+Sakooooo@users.noreply.github.com>
Date: Fri, 9 Aug 2024 21:23:02 +0400
Subject: [PATCH] Revert "yeah"

This reverts commit 5bda7cba9bee0bd71726d8eed319ba6b4e138a43.
---
 config/emacs/emacs.org | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/config/emacs/emacs.org b/config/emacs/emacs.org
index 95967209..fb18f1cb 100644
--- a/config/emacs/emacs.org
+++ b/config/emacs/emacs.org
@@ -206,6 +206,11 @@ 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