Ah d'accord en fait j'avais pas compris comment ça marche git
This commit is contained in:
parent
25c05a02b6
commit
d6adc2a82b
1 changed files with 0 additions and 6 deletions
|
@ -3,14 +3,8 @@ set $mod Mod4
|
||||||
floating_modifier $mod
|
floating_modifier $mod
|
||||||
set $refresh_i3status killall -SIGUSR1 i3status
|
set $refresh_i3status killall -SIGUSR1 i3status
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
# Font
|
# Font
|
||||||
font pango:monospace 8
|
|
||||||
=======
|
|
||||||
# Font for window titles. Will also be used by the bar unless a different font
|
|
||||||
# is used in the bar {} block below.
|
|
||||||
font pango:monospace 9
|
font pango:monospace 9
|
||||||
>>>>>>> refs/remotes/origin/master
|
|
||||||
|
|
||||||
# Modifiers
|
# Modifiers
|
||||||
tiling_drag modifier titlebar
|
tiling_drag modifier titlebar
|
||||||
|
|
Loading…
Reference in a new issue