From fb28d96b848609d9d9095e0963080253016c92dd Mon Sep 17 00:00:00 2001
From: Luke Macken <lmacken@redhat.com>
Date: Jun 24 2014 18:27:32 +0000
Subject: Fix merge


---

diff --git a/bodhi.spec b/bodhi.spec
index 1a4e0e8..3ae8af2 100644
--- a/bodhi.spec
+++ b/bodhi.spec
@@ -2,13 +2,8 @@
 %{!?pyver: %global pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           bodhi
-<<<<<<< HEAD
-Version:        0.9.9.2
-Release:        2%{?dist}
-=======
 Version:        0.9.10
 Release:        1%{?dist}
->>>>>>> Update to 0.9.10
 Summary:        A modular framework that facilitates publishing software updates
 Group:          Applications/Internet
 License:        GPLv2+