From 197ab6392333f4aff4c988cc75252221aeab38da Mon Sep 17 00:00:00 2001
From: Michael Zhang <iptq@protonmail.com>
Date: Mon, 15 Jun 2020 05:58:51 -0500
Subject: [PATCH] fml

---
 dot_config/i3/config | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/dot_config/i3/config b/dot_config/i3/config
index 28cdffa..fafcf9a 100644
--- a/dot_config/i3/config
+++ b/dot_config/i3/config
@@ -68,11 +68,7 @@ bindsym $mod+Shift+q kill
 
 # start dmenu (a program launcher)
 # bindsym $mod+space exec dmenu_run
-<<<<<<< HEAD
 bindsym $mod+space exec $HOME/.local/scripts/rofiwrap.sh
-=======
-bindsym $mod+space exec "rofi -show combi -modi combi -combi-modi window,drun -levenshtein-sort"
->>>>>>> fd56869... changes
 # There also is the (new) i3-dmenu-desktop which only displays applications
 # shipping a .desktop file. It is a wrapper around dmenu, so you need that
 # installed.