From fa4932ec16dcb8fa62868268de18a47d0e7e95f9 Mon Sep 17 00:00:00 2001
From: Matthias Mees <mm@yellowled.de>
Date: Thu, 12 Sep 2013 09:14:24 +0200
Subject: [PATCH] Oops, missed a conflict marker.

---
 .gitignore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 11f09734..1824ddf5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,7 +5,6 @@
 /*.zip
 /testxmlrpc.php
 /test.php
-<<<<<<< HEAD
 *.db
 *~
 DEADJOE