From 790b50740f3ba9234fc60f6c08adcefda73157bb Mon Sep 17 00:00:00 2001
From: Matthias Strubel <matthias.strubel@aod-rpg.de>
Date: Tue, 9 Apr 2013 08:02:00 +0200
Subject: [PATCH] fixing merge issue

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

diff --git a/.gitignore b/.gitignore
index d529ca8..7cfd078 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 piratebox/piratebox/version
 piratebox/piratebox/www/chat_content.html
 image_stuff/*
-piratebox/piratebox/bin/miniircd.py
 piratebox_ws_*
 piratebox-ws_*
+tmp/*
+piratebox/piratebox/bin/miniircd.py