diff --git a/.gitignore b/.gitignore
index 24f97f0..17c9443 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,7 @@
 /vdr-plugin-graphlcd-1.0.3.tar.bz2
 /vdr-plugin-graphlcd-1.0.4.tar.bz2
 /vdr-plugin-graphlcd-1.0.5.tar.bz2
+<<<<<<< HEAD
+=======
 /vdr-plugin-graphlcd-1.0.6.tar.bz2
+>>>>>>> rawhide