[znc] Fix merge

[Nick Bebout]

commit 09cb7a54c6a8c57300c299610e5a174c4767d2d1
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Fri Jan 7 18:28:30 2011 -0600

    Fix merge

 znc.spec |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
---
diff --git a/znc.spec b/znc.spec
index a6210cb..d91a888 100644
--- a/znc.spec
+++ b/znc.spec
@@ -178,7 +178,6 @@ chmod -x modules/q.cpp
 %{_libdir}/znc/modpython.so
 
 %changelog
-<<<<<<< HEAD
 * Fri Jan 7 2011 Nick Bebout <nb at fedoraproject.org> - 0.097-4.svn2255
 - Update to svn2255