From 940686111dfca6dd9e2150e26ceee983b1fc54fa Mon Sep 17 00:00:00 2001
From: Gergely Polonkai <gergely@polonkai.eu>
Date: Sat, 5 Jan 2013 14:35:44 +0100
Subject: [PATCH] Consolidated conf/.gitignore into main .gitignore file

---
 .gitignore      | 1 +
 conf/.gitignore | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 100644 conf/.gitignore

diff --git a/.gitignore b/.gitignore
index 87f3e1f..fe1e936 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,4 @@ create-world.sh
 drop-world.sh
 libtool
 nbproject/private
+conf/wmud.conf
diff --git a/conf/.gitignore b/conf/.gitignore
deleted file mode 100644
index 7bc6d90..0000000
--- a/conf/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-wmud.conf