summaryrefslogtreecommitdiffstats
path: root/.config/gtk-3.0/settings.ini
diff options
context:
space:
mode:
authorJoe <rbo@gmx.us>2024-02-05 09:39:53 +0100
committerJoe <rbo@gmx.us>2024-02-05 09:39:53 +0100
commit793a3ac2e7e93a3e4213287b63f62ff3451a69b2 (patch)
tree0ca29aa3feadeddc858515b33a00a38c16ce7c55 /.config/gtk-3.0/settings.ini
parentqwe (diff)
downloaddotfiles-bsd-793a3ac2e7e93a3e4213287b63f62ff3451a69b2.tar.gz
dotfiles-bsd-793a3ac2e7e93a3e4213287b63f62ff3451a69b2.tar.bz2
dotfiles-bsd-793a3ac2e7e93a3e4213287b63f62ff3451a69b2.tar.xz
dotfiles-bsd-793a3ac2e7e93a3e4213287b63f62ff3451a69b2.tar.zst
dotfiles-bsd-793a3ac2e7e93a3e4213287b63f62ff3451a69b2.zip
up
Diffstat (limited to '.config/gtk-3.0/settings.ini')
-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