[supybot-gribble/f15] removed conflicts, no longer required

[Dave Riches]

commit f1f423e779e5b3c6fedab0cbc783e68331b9aa8d
Author: Dave Riches <david.r at ultracar.co.uk>
Date:   Mon Jul 25 19:03:49 2011 +0100

    removed conflicts, no longer required

 supybot-gribble.spec |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/supybot-gribble.spec b/supybot-gribble.spec
index 86e990b..a29fcf1 100644
--- a/supybot-gribble.spec
+++ b/supybot-gribble.spec
@@ -1,7 +1,7 @@
 Summary:	Cross-platform support bot based on supybot
 Name:		supybot-gribble
 Version:	0.83.4.1
-Release:	6%{?dist}
+Release:	8%{?dist}
 License:	BSD and GPLv2 and Python
 Group:		Applications/Internet
 URL:		http://sourceforge.net/apps/mediawiki/gribble/	
@@ -15,7 +15,6 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch:	noarch
 BuildRequires:	python-devel
 Requires:	python-sqlite2
-Conflicts:	supybot
 Obsoletes: supybot < 0.83.4.1-7%{dist}
 Provides: supybot = 0.83.4.1-8%{dist}
 
@@ -73,6 +72,9 @@ rm  -rf %{buildroot}
 
 
 %changelog
+* Mon Jul 25 2011 david <david.r at ultracar.co.uk> - 0.83.4.1-8
+- removed conflicts, no longer required
+
 * Fri Jul 01 2011 Dave Riches <david.r at ultracar.co.uk> - 0.83.4.1-6
 - fixed obsoletes to work with supybot