From 92a553ee96d64945e724aa292ad61ccbda3a2c59 Mon Sep 17 00:00:00 2001
From: Ian <aristophian@googlemail.com>
Date: Thu, 12 Sep 2013 08:48:43 +0200
Subject: [PATCH] gitignore remove <<<<<<< HEAD rest

---
 .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