summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index ce3a5c14f..8957156d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -60,7 +60,6 @@ Thumbs.db
# /conf/
/conf/import/*.conf
-/conf/import/battle_conf.txt
/conf/import/msg_conf.txt
# /log/