summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
Diffstat (limited to '.gitignore')
-rwxr-xr-x.gitignore7
1 files changed, 4 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index 0361746..930a056 100755
--- a/.gitignore
+++ b/.gitignore
@@ -10,9 +10,6 @@
!/.config
/.config/*
-shortcutrc
-shortcuts*
-
!/.config/fdignore
!/.config/ytignore
!/.config/mimeapps.list
@@ -94,3 +91,7 @@ shortcuts*
!/.local/share/applications
/.local/share/applications/mimeinfo.cache
!/.local/share/chars
+
+shortcutrc
+shortcuts*
+*.sync-conflict-*