Compare commits

..

No commits in common. "71c2e6b3b428fc77421fbfcaebb75e60155c92f9" and "713dafadd3789a7c8dbb2512aca10762b065c8ab" have entirely different histories.

2 changed files with 3 additions and 7 deletions

View file

@ -1,7 +1,7 @@
[Settings]
gtk-theme-name=pogmom-gtk
gtk-icon-theme-name=Adwaita
gtk-font-name=Cantarell 11
gtk-icon-theme-name=breeze-dark
gtk-font-name=Overpass Nerd Font Propo 10
gtk-cursor-theme-name=Adwaita
gtk-cursor-theme-size=24
gtk-toolbar-style=GTK_TOOLBAR_ICONS
@ -14,4 +14,4 @@ gtk-xft-antialias=1
gtk-xft-hinting=1
gtk-xft-hintstyle=hintslight
gtk-xft-rgba=rgb
gtk-application-prefer-dark-theme=0
gtk-application-prefer-dark-theme=1

View file

@ -32,14 +32,10 @@ geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\0\0\0\x2\x82\0\0\x1\x
[SettingsWindow]
<<<<<<< HEAD
geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\0\0\0\x3\x94\0\0\x1\xf8\0\0\0\0\0\0\0\0\0\0\x3\x94\0\0\x1\xf8\0\0\0\0\0\0\0\0\aP\0\0\0\0\0\0\0\0\0\0\x3\x94\0\0\x1\xf8)
=======
<<<<<<< HEAD
geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\bz\0\0\a\b\0\0\v\\\0\0\t\xb7\0\0\bz\0\0\a\b\0\0\v\\\0\0\t\xb7\0\0\0\x1\0\0\0\0\rp\0\0\bz\0\0\a\b\0\0\v\\\0\0\t\xb7)
=======
geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\0\0\0\x2^\0\0\x3\v\0\0\0\0\0\0\0\0\0\0\x2^\0\0\x3\v\0\0\0\0\0\0\0\0\aP\0\0\0\0\0\0\0\0\0\0\x2^\0\0\x3\v)
>>>>>>> 0de232fa65a30a570a909c7ee0b1859b441ca9b0
>>>>>>> 713dafadd3789a7c8dbb2512aca10762b065c8ab
[Troubleshooting]
force_raster_widgets=1