[rubygem-sequel/f16: 16/16] updated to version 3.30.0 of ruby gem sequel

[Alejandro Perez]

commit dbfe08257a29fe4468fe1baa22a8de5bf5bcc686
Author: Alejandro Pérez <alejandro at probook.esource.homelinux.org>
Date:   Sun Dec 4 22:48:02 2011 -0500

    updated to version 3.30.0 of ruby gem sequel

 rubygem-sequel.spec |   12 ------------
 1 files changed, 0 insertions(+), 12 deletions(-)
---
diff --git a/rubygem-sequel.spec b/rubygem-sequel.spec
index f670d54..8b21e67 100644
--- a/rubygem-sequel.spec
+++ b/rubygem-sequel.spec
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-# Generated from sequel-3.24.0.gem by gem2rpm -*- rpm-spec -*-
-=======
 # Generated from sequel-3.30.0.gem by gem2rpm -*- rpm-spec -*-
->>>>>>> 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,13 +6,8 @@
 
 Summary: The Database Toolkit for Ruby
 Name: rubygem-%{gemname}
-<<<<<<< HEAD
-Version: 3.24.0
-Release: 8%{?dist}
-=======
 Version: 3.30.0
 Release: 11%{?dist}
->>>>>>> master
 Group: Development/Languages
 License: MIT
 URL: http://sequel.rubyforge.org
@@ -73,15 +64,12 @@ rm -rf %{buildroot}
 %doc %{geminstdir}/doc
 
 %changelog
-<<<<<<< HEAD
-=======
 * Sun Dec 04 2011 Alejandro Pérez <aeperezt at fedoraproject.org> - 3.30.0-11
 - fix download path from rubygems.org
 * Sun Dec 04 2011 Alejandro Pérez <aeperezt at fedoraproject.org> - 3.30.0-10
 - Change version to current version 3.30.0
 * Sun Oct 20 2011 Alejandro Pérez <aeperezt at fedoraproject.org> - 3.28.0-9
 - Change version to current 2.28.0
->>>>>>> master
 * Tue Sep 21 2011 Alejandro Pérez <aeperezt at fedoraproject.org> - 3.24.0-8
 - change version to 3.24.0
 * Mon Apr 11 2011 Alejandro Pérez <aeperezt at fedoraproject.org> - 3.20.0-7