summaryrefslogtreecommitdiffstats
path: root/.config/gtk-3.0
diff options
context:
space:
mode:
Diffstat (limited to '.config/gtk-3.0')
-rw-r--r--.config/gtk-3.0/settings.ini4
1 files changed, 4 insertions, 0 deletions
diff --git a/.config/gtk-3.0/settings.ini b/.config/gtk-3.0/settings.ini
index fd23b35..d51d9a6 100644
--- a/.config/gtk-3.0/settings.ini
+++ b/.config/gtk-3.0/settings.ini
@@ -1,5 +1,9 @@
[Settings]
+<<<<<<< HEAD
gtk-font-name=sans-serif 12
+=======
+gtk-font-name=Fira Sans Semi-Light 12
+>>>>>>> d1f2cfd (pop)
gtk-icon-theme-name=Gruvbox_Dark
gtk-theme-name=Gruvbox-Dark-B
gtk-cursor-theme-size=0