[rubygem-sequel: 3/3] upgrade to 3.20.gem

[Alejandro Perez]

commit 7ab214b915c1450660f5aa89475c1a987abb3936
Merge: b320cd2 273c994
Author: Alejandro Perez <aperez at probook.esource.homelinux.org>
Date:   Fri Jul 29 00:19:18 2011 -0500

    upgrade to 3.20.gem

 SPECS/rubygem-sequel.spec |   17 ++++++++++++++++-
 sequel-3.20.0.gem         |  Bin 0 -> 689152 bytes
 2 files changed, 16 insertions(+), 1 deletions(-)
---
diff --cc SPECS/rubygem-sequel.spec
index aeaca7d,5679144..37b6e87
--- a/SPECS/rubygem-sequel.spec
+++ b/SPECS/rubygem-sequel.spec
@@@ -1,4 -1,4 +1,8 @@@
++<<<<<<< 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
@@@ -6,7 -6,7 +10,11 @@@
  
  Summary: The Database Toolkit for Ruby
  Name: rubygem-%{gemname}
++<<<<<<< HEAD
 +Version: 3.24.0
++=======
+ Version: 3.20.0
++>>>>>>> origin/master
  Release: 7%{?dist}
  Group: Development/Languages
  License: MIT
@@@ -65,8 -64,11 +72,16 @@@ rm -rf %{buildroot
  %doc %{geminstdir}/doc
  
  %changelog
++<<<<<<< HEAD
 +* Fri Jul 28 2011 Alejandro Pérez <aeperezt at fedoraproject.org> - 3.24.0-7
 +- Update to gem 3.24
++=======
+ * Mon Apr 11 2011 Alejandro Pérez <aeperezt at fedoraproject.org> - 3.20.0-7
+ - change version to 3.20.0
+ * Tue Jan 18 2011 Alejandro Pérez <aeperezt at fedoraproject.org> - 3.19.0-6
+ * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.19.0-8
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
++>>>>>>> origin/master
  * Thu Nov 04 2010 Alejandro Pérez <aeperezt at fedoraproject.org> - 3.16.0-6
  - Change License to MIT