summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorwushin <pasekei@gmail.com>2016-10-12 15:47:41 -0500
committerwushin <pasekei@gmail.com>2016-10-13 16:34:18 -0500
commitedef2f2479bf22d390e6c91ae81051f53c28a5e0 (patch)
tree41a9c5437eca0e4f4723b1fe8c0838015f03c57f /.gitignore
parent994250e7619a0a18a61d65c9a132fcf71abce2f2 (diff)
downloadtools-edef2f2479bf22d390e6c91ae81051f53c28a5e0.tar.gz
tools-edef2f2479bf22d390e6c91ae81051f53c28a5e0.tar.bz2
tools-edef2f2479bf22d390e6c91ae81051f53c28a5e0.tar.xz
tools-edef2f2479bf22d390e6c91ae81051f53c28a5e0.zip
Gitlab Auto-Merge MRs on test
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore3
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index d65c486..6bd460b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,3 +41,6 @@ dyecmd/src/cmake_install.cmake
# testxml
testxml/errors.txt
+
+# gitlab merger
+herculeswrapper/herc-map-wrapper-config