summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.config/gtk-3.0/settings.ini4
1 files changed, 0 insertions, 4 deletions
diff --git a/.config/gtk-3.0/settings.ini b/.config/gtk-3.0/settings.ini
index d51d9a6..2f6cc69 100644
--- a/.config/gtk-3.0/settings.ini
+++ b/.config/gtk-3.0/settings.ini
@@ -1,9 +1,5 @@
[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