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