Gabe/dotfiles
1
0
Fork 0
Code Issues 6 Pull requests Projects Releases Wiki Activity

removed leftover merge conflict syntax.

Browse source
This commit is contained in:
Gabe Venberg 2023-07-16 18:43:11 -05:00
parent ebf14705b3
commit 0e4f46aafd
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
i3/.config/i3/config
View file

@ -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)"