removed leftover merge conflict syntax.
This commit is contained in:
parent
ebf14705b3
commit
0e4f46aafd
|
@ -204,7 +204,6 @@ font pango:DejaVu Sans Mono 8
|
||||||
#colour picker with xcolor
|
#colour picker with xcolor
|
||||||
bindsym --release $mod+p exec --no-startup-id "xcolor -s"
|
bindsym --release $mod+p exec --no-startup-id "xcolor -s"
|
||||||
|
|
||||||
>>>>>>> 50dd73ec62e82ed8f43dfb3e5ebe68f49caa19f8
|
|
||||||
#mpd controls
|
#mpd controls
|
||||||
bindsym $mod+mod1+p exec --no-startup-id "mpc toggle"
|
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)"
|
bindsym $mod+mod1+plus exec --no-startup-id "mpc volume +1; notify-send --expire-time=1000 $(mpc volume)"
|
||||||
|
|
Loading…
Reference in a new issue