merge
parent
e53df3d93a
commit
b4c2577a48
|
@ -1,8 +1,4 @@
|
|||
[Settings]
|
||||
<<<<<<< HEAD
|
||||
gtk-color-scheme = "base_color:#f9f9f9\nbg_color:#dedede\ntooltip_bg_color:#2d2d2d\nselected_bg_color:#d64937\ntext_color:#555555\nfg_color:#555555;\ntooltip_fg_color:#f9f9f9\nselected_fg_color:#f9f9f9\nlink_color:#d64937"
|
||||
=======
|
||||
gtk-color-scheme = "base_color:#f9f9f9\nbg_color:#dedede\ntooltip_bg_color:#2d2d2d\nselected_bg_color:#d64937\ntext_color:#555555\nfg_color:#555555\ntooltip_fg_color:#f9f9f9\nselected_fg_color:#f9f9f9\nlink_color:#d64937"
|
||||
>>>>>>> d2566a7a46b2a1fbf7f5e4ccbf384e0a7dace5f3
|
||||
gtk-auto-mnemonics = 1
|
||||
gtk-visible-focus = automatic
|
||||
|
|
Loading…
Reference in New Issue