From 05dc82646892183a232d172bcd7600662d81361f Mon Sep 17 00:00:00 2001
From: Nick Bebout <nb@fedoraproject.org>
Date: Fri, 24 Sep 2010 20:31:57 -0400
Subject: [PATCH] Merge master into el5

---
 .gitignore | 4 ----
 1 file changed, 4 deletions(-)

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