diff --git a/.gitignore b/.gitignore
index 3319075..e6db9a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1 @@
-<<<<<<< HEAD
-znc-0.093.svn2101.tar.bz2
-=======
 znc-0.094.tar.gz
->>>>>>> master