[rubygem-sequel/f18: 7/7] fix merge to update to sequel 3.47.0

[Alejandro Perez]

commit 77d235557fb2b06283cb8db6b514fc6eccfbf5e1
Author: Alejandro Perez <aeperezt at fedoraproject.org>
Date:   Sun May 12 12:37:17 2013 -0500

    fix merge to update to sequel 3.47.0

 rubygem-sequel.spec |   15 ---------------
 1 files changed, 0 insertions(+), 15 deletions(-)
---
diff --git a/rubygem-sequel.spec b/rubygem-sequel.spec
index ffae9e6..d05097f 100644
--- a/rubygem-sequel.spec
+++ b/rubygem-sequel.spec
@@ -2,23 +2,14 @@
 
 Summary: The Database Toolkit for Ruby
 Name: rubygem-%{gem_name}
-<<<<<<< HEAD
-Version: 3.46.0
-Release: 2%{?dist}
-=======
 Version: 3.47.0
 Release: 1%{?dist}
->>>>>>> master
 Group: Development/Languages
 License: MIT
 URL: http://sequel.rubyforge.org
 Source0: http://rubygems.org/downloads/%{gem_name}-%{version}.gem
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-<<<<<<< HEAD
 Requires: ruby(abi) 
-=======
-Requires: ruby(release)
->>>>>>> master
 Requires: ruby(rubygems)
 BuildRequires: ruby-devel
 BuildRequires: rubygems-devel
@@ -78,11 +69,5 @@ rm -rf %{buildroot}
 %doc %{gem_instdir}/doc
 
 %changelog
-<<<<<<< HEAD
-* Wed May 1 2013 Alejandro Pérez <aeperezt at fedoraproject.org> - 3.46.0-2
-- remove release dependence
-* Mon Apr 29 2013 Alejandro Pérez <aeperezt at fedoraproject.org> - 3.46.0-1
-=======
 * Sun May 12 2013 Alejandro Pérez <aeperezt at fedoraproject.org> - 3.47.0-1
->>>>>>> master
 - Initial package