From 2574165d59673e6c6105924c3cfb3a2884066dfd Mon Sep 17 00:00:00 2001
From: Michael Chalupiak <mikec@mchalupiak.com>
Date: Wed, 19 Mar 2025 23:51:08 -0400
Subject: [PATCH] kakoune merge fiz

---
 config/.config/kak/kakrc | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/config/.config/kak/kakrc b/config/.config/kak/kakrc
index c16b18c..99ea0d8 100644
--- a/config/.config/kak/kakrc
+++ b/config/.config/kak/kakrc
@@ -436,8 +436,4 @@ map -docstring 'clipboard paste' global user p ':xpaste<ret>'
 map -docstring 'quit kakoune' global user q ':q<ret>'
 map -docstring 'toggle comments' global user c ':comment-line<ret>'
 
-<<<<<<< HEAD
-colorscheme base16-gruvbox-dark-medium
-=======
 colorscheme gruvbox-dark
->>>>>>> master