Merge branch 'py-moo/set-dns-lifetime' into 'master'

[irc/rizon/acid.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 478e86365b9d7c78173b4751a811d2b3c0f07642..7b2e3153dc4647355ffbb7360ed1ebb007be590d 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@
 *.log.*
 *.yml
 !*.example.yml
+!trivia.yml
 !.gitlab-ci.yml
 *.ini
 !*.example.ini
@@ -16,3 +17,5 @@ target
 *.pyd
 known_hosts
 .pydev*
+*.iml
+.idea