[rubygem-aws: 3/3] Fixed conflict

[Michal Fojtik]

commit 37d69b5ceb45bfb5c2213ecd5f8bddb4d59f9436
Author: Michal Fojtik <mi at mifo.sk>
Date:   Tue Mar 29 14:20:55 2011 +0200

    Fixed conflict

 rubygem-aws.spec |   11 ++---------
 1 files changed, 2 insertions(+), 9 deletions(-)
---
diff --git a/rubygem-aws.spec b/rubygem-aws.spec
index fa0cf7b..7d6a1bc 100644
--- a/rubygem-aws.spec
+++ b/rubygem-aws.spec
@@ -4,13 +4,8 @@
 
 Summary: Ruby gem for all Amazon Web Services
 Name: rubygem-%{gemname}
-<<<<<<< HEAD
 Version: 2.4.5
 Release: 1%{?dist}
-=======
-Version: 2.4.2
-Release: 2%{?dist}
->>>>>>> a627b37204788a28b3ac0a9c06d87c4925d3f872
 Group: Development/Languages
 License: MIT
 URL: http://github.com/appoxy/aws
@@ -58,14 +53,12 @@ rm -rf %{buildroot}
 %doc %{gemdir}/doc/%{gemname}-%{version}
 
 %changelog
-<<<<<<< HEAD
 * Fri Feb 04 2011 Michal Fojtik <mfojtik at redhat.com> - 2.4.5-1
 - Version bump
-- Dropped activesupport
-=======
+- Removed activesupport
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
->>>>>>> a627b37204788a28b3ac0a9c06d87c4925d3f872
 
 * Fri Feb 04 2011 Michal Fojtik <mfojtik at redhat.com> - 2.4.2-1
 - Version bump