summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-08-20 16:27:11 +0300
committerGitHub <noreply@github.com>2016-08-20 16:27:11 +0300
commitaf77eec4f736f989703f81df903a1a7c971fa659 (patch)
treeecadc9763347f1c6a04507f714e58f37f778533a /.gitignore
parent68947c86d5fe3eb2686c9b3393e3db0df083bb11 (diff)
parent9e02b4ed69ce857e3bda57c7f1d3b2457559c534 (diff)
downloadhercules-af77eec4f736f989703f81df903a1a7c971fa659.tar.gz
hercules-af77eec4f736f989703f81df903a1a7c971fa659.tar.bz2
hercules-af77eec4f736f989703f81df903a1a7c971fa659.tar.xz
hercules-af77eec4f736f989703f81df903a1a7c971fa659.zip
Merge pull request #1399 from HerculesWS/settings_libconfig
Ported the configuration to libconfig format
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore3
1 files changed, 2 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index d3c4fe51a..8957156d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -59,7 +59,8 @@ Thumbs.db
/cache/
# /conf/
-/conf/import
+/conf/import/*.conf
+/conf/import/msg_conf.txt
# /log/
/log/*.log