zsh: remove erroneously retained merge text

[dotfiles.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index a29945680bafb7fd18bda423c3fb9812f00bfdb4..50c82590cac8245872af09edcbe1655bfd765def 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,12 @@
-xdg/tint2/tint2rc.backup.*
-

 # vim
 # vim

-base/.vim/.netrwhist
+/etc/vim/.netrwhist

 *.swp
 *.swo
 *.swp
 *.swo

+
+# fontconfig
+/gui/fonts/**/.uuid
+/gui/fonts/**/fonts.dir
+/gui/fonts/**/fonts.scale
+
+# zsh local
+/etc/zsh/.z*.local