[BitchX/f16] merging spec from master

[Dan Mashal]

commit f8fa5fca3f957e8ff8a9f2860c7399672ba85873
Author: Dan Mashal <vicodan at fedoraproject.org>
Date:   Mon May 14 18:27:07 2012 -0700

    merging spec from master

 BitchX.spec |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)
---
diff --git a/BitchX.spec b/BitchX.spec
index efed494..c4f40ba 100644
--- a/BitchX.spec
+++ b/BitchX.spec
@@ -1,11 +1,7 @@
 Summary: IrcII chat client
 Name: BitchX
 Version: 1.2
-<<<<<<< HEAD
-Release: 7%{?dist}
-=======
 Release: 8%{?dist}
->>>>>>> master
 License: BSD and GPLv2+
 Group: Applications/Communications
 URL: http://www.bitchx.org
@@ -37,12 +33,9 @@ rm -rf %{buildroot}
 %{_mandir}/man1/*
 
 %changelog
-<<<<<<< HEAD
-=======
 * Mon May 14 2012 Dan Mashal <vicodan at fedoraproject.org> 1.2-8
 -Updated to latest source code (svn rev 181)
 
->>>>>>> master
 * Fri May 10 2012 Dan Mashal <vicodan at fedoraproject.org> 1.2-7
 -Various bugfixes and update to the latest BitchX source code (svn rev 180)