[rubygem-sequel] modify spec

[Alejandro Perez]

commit 273c99475e42edaeb4166821af9033738d5d6083
Author: Alejandro Perez <alejandro.perez.torres at gmail.com>
Date:   Mon Apr 11 17:09:46 2011 -0500

    modify spec

 rubygem-sequel.spec |   12 ------------
 1 files changed, 0 insertions(+), 12 deletions(-)
---
diff --git a/rubygem-sequel.spec b/rubygem-sequel.spec
index 18e8358..5679144 100644
--- a/rubygem-sequel.spec
+++ b/rubygem-sequel.spec
@@ -6,13 +6,8 @@
 
 Summary: The Database Toolkit for Ruby
 Name: rubygem-%{gemname}
-<<<<<<< HEAD
 Version: 3.20.0
 Release: 7%{?dist}
-=======
-Version: 3.19.0
-Release: 8%{?dist}
->>>>>>> 7265a27b8306e9473fd991d3fe73fead4b09eefd
 Group: Development/Languages
 License: MIT
 URL: http://sequel.rubyforge.org
@@ -69,18 +64,11 @@ rm -rf %{buildroot}
 %doc %{geminstdir}/doc
 
 %changelog
-<<<<<<< HEAD
 * 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
-
-* Tue Jan 18 2011 Alejandro Pérez <aeperezt at fedoraproject.org> - 3.19.0-7
->>>>>>> 7265a27b8306e9473fd991d3fe73fead4b09eefd
-- change version from 3.16.0 to 3.19.0
-
 * Thu Nov 04 2010 Alejandro Pérez <aeperezt at fedoraproject.org> - 3.16.0-6
 - Change License to MIT