From edef2f2479bf22d390e6c91ae81051f53c28a5e0 Mon Sep 17 00:00:00 2001
From: wushin <pasekei@gmail.com>
Date: Wed, 12 Oct 2016 15:47:41 -0500
Subject: Gitlab Auto-Merge MRs on test

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

(limited to '.gitignore')

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
-- 
cgit v1.2.3-70-g09d2