summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorlassulus <lassulus@googlemail.com>2013-11-06 18:22:50 +0100
committerlassulus <lassulus@googlemail.com>2013-11-06 18:22:50 +0100
commitb8035a82c362d24c2adf464a1c99fcc098b743c4 (patch)
tree039ebc8342f5889ba2344df74e7fd0bc65792bfb /.gitignore
parent401ca308d6f1c501788729433a9e3c58ddfab590 (diff)
parent1afa7f72d3eae517b3eb742228931694910a087a (diff)
Merge branch 'master' of github.com:krebscode/painload
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 4ccc216f..e2b93f24 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,6 +28,6 @@ a.out
/ovh/soapi/SOAPpy
/Reaktor/IRC/irclib.py
/Reaktor/public_commands/*
-/ship/out
+/ship/tmp
/webchat/node_modules
/webchat/local_config