[rubygem-sequel] fix spec files error on merge

[Alejandro Perez]

commit 4837388b47e33ea583fdbc301b27d8f310fb5544
Author: Alejandro Perez <aperez at probook.esource.homelinux.org>
Date:   Fri Jul 29 00:25:04 2011 -0500

    fix spec files error on merge

 SPECS/rubygem-sequel.spec |   13 +++----------
 1 files changed, 3 insertions(+), 10 deletions(-)
---
diff --git a/SPECS/rubygem-sequel.spec b/SPECS/rubygem-sequel.spec
index 2bd09a7..477c042 100644
--- a/SPECS/rubygem-sequel.spec
+++ b/SPECS/rubygem-sequel.spec
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 
-=======
-# Generated from sequel-3.20.0.gem by gem2rpm -*- rpm-spec -*-
->>>>>>> origin/master
 %global ruby_sitelib %(/usr/bin/ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
 %global gemdir %(/usr/bin/ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
 %global gemname sequel
@@ -10,12 +6,8 @@
 
 Summary: The Database Toolkit for Ruby
 Name: rubygem-%{gemname}
-<<<<<<< HEAD
 Version: 3.24.0
-=======
-Version: 3.20.0
->>>>>>> origin/master
-Release: 7%{?dist}
+Release: 12%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://sequel.rubyforge.org
@@ -72,7 +64,8 @@ rm -rf %{buildroot}
 %doc %{geminstdir}/doc
 
 %changelog
-<<<<<<< HEAD
+* Fri Jul 28 2011 Alejandro Pérez <aeperezt at fedoraproject.org> - 3.24.0-12
+- Fix error on merge
 * Fri Jul 28 2011 Alejandro Pérez <aeperezt at fedoraproject.org> - 3.24.0-11
 - Update to gem 3.24
 * Mon Apr 11 2011 Alejandro Pérez <aeperezt at fedoraproject.org> - 3.20.0-10