From 3dd9b60f5f06fa9ad2a52b582fbbdb3d5cb505db Mon Sep 17 00:00:00 2001
From: Michael Chalupiak <mikec@mchalupiak.com>
Date: Fri, 4 Apr 2025 11:46:29 -0400
Subject: [PATCH] merge error in bashrc

---
 config/.bashrc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/.bashrc b/config/.bashrc
index 4f0890b..d7cb38b 100644
--- a/config/.bashrc
+++ b/config/.bashrc
@@ -131,9 +131,9 @@ alias zf='z $(flirt)'
 # You may want to put all your additions into a separate file like
 # ~/.bash_aliases, instead of adding them here directly.
 # See /usr/share/doc/bash-doc/examples in the bash-doc package.
-# if [ -z "$EDITOR" ]; then
-export EDITOR='kak'
-# fi
+if [ -z "$EDITOR" ]; then
+    export EDITOR='kak'
+fi
 
 if [ -f ~/.bash_aliases ]; then
     . ~/.bash_aliases