summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorRuben Pollan <meskio@sindominio.net>2014-09-04 11:41:18 -0500
committerRuben Pollan <meskio@sindominio.net>2014-09-04 11:41:18 -0500
commit7e84a21a837b8d3f1ce72bc349ab966ef80ed1a2 (patch)
tree12ecb3db7908cff56154fcc77a89efe7783c3f9b /.gitignore
parent7fb94e10525e76b6533e720c56945fa81df3b9fd (diff)
parent4ececdae474791ab58b42f195bfe37e9ad3d03b2 (diff)
Merge branch 'kali/feature/cleanup-mail-tests' into develop
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 91e42e2..7ac8289 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@ share/
MANIFEST
twistd.pid
_trial_temp
+_trial_temp.lock