From 0e4f46aafdf8df1c067c360ac6866297cc393834 Mon Sep 17 00:00:00 2001
From: Gabe Venberg <gabevenberg@gmail.com>
Date: Sun, 16 Jul 2023 18:43:11 -0500
Subject: [PATCH] removed leftover merge conflict syntax.

---
 i3/.config/i3/config | 1 -
 1 file changed, 1 deletion(-)

diff --git a/i3/.config/i3/config b/i3/.config/i3/config
index 31d2d55..0eb1d9c 100644
--- a/i3/.config/i3/config
+++ b/i3/.config/i3/config
@@ -204,7 +204,6 @@ font pango:DejaVu Sans Mono 8
 	#colour picker with xcolor
 		bindsym --release $mod+p exec --no-startup-id "xcolor -s"
 
->>>>>>> 50dd73ec62e82ed8f43dfb3e5ebe68f49caa19f8
 	#mpd controls
 		bindsym $mod+mod1+p exec --no-startup-id "mpc toggle"
 		bindsym $mod+mod1+plus exec --no-startup-id "mpc volume +1; notify-send --expire-time=1000 $(mpc volume)"