[supybot-fedora/el6] Actually merge

[Patrick Uiterwijk]

commit 4708305706f58f3e594ced2cdf3cbdf07719cbfb
Author: Patrick Uiterwijk <puiterwijk at gmail.com>
Date:   Fri May 3 21:04:59 2013 +0200

    Actually merge

 supybot-fedora.spec |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
---
diff --git a/supybot-fedora.spec b/supybot-fedora.spec
index 690f473..a1ed5f8 100644
--- a/supybot-fedora.spec
+++ b/supybot-fedora.spec
@@ -1,11 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           supybot-fedora
-<<<<<<< HEAD
-Version:        0.2.9.1
-=======
 Version:        0.2.11
->>>>>>> master
 Release:        1%{?dist}
 Summary:        Plugin for Supybot to interact with Fedora services