[rubygem-sequel] fix change log

[Alejandro Perez]

commit 65f0d0cc952f437c5001bf3830dbb1efa46a5a46
Author: Alejandro Perez <aperez at probook.esource.homelinux.org>
Date:   Fri Jul 29 00:23:14 2011 -0500

    fix change log

 SPECS/rubygem-sequel.spec |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)
---
diff --git a/SPECS/rubygem-sequel.spec b/SPECS/rubygem-sequel.spec
index 37b6e87..2bd09a7 100644
--- a/SPECS/rubygem-sequel.spec
+++ b/SPECS/rubygem-sequel.spec
@@ -73,15 +73,13 @@ rm -rf %{buildroot}
 
 %changelog
 <<<<<<< HEAD
-* Fri Jul 28 2011 Alejandro Pérez <aeperezt at fedoraproject.org> - 3.24.0-7
+* Fri Jul 28 2011 Alejandro Pérez <aeperezt at fedoraproject.org> - 3.24.0-11
 - Update to gem 3.24
-=======
-* Mon Apr 11 2011 Alejandro Pérez <aeperezt at fedoraproject.org> - 3.20.0-7
+* Mon Apr 11 2011 Alejandro Pérez <aeperezt at fedoraproject.org> - 3.20.0-10
 - change version to 3.20.0
-* Tue Jan 18 2011 Alejandro Pérez <aeperezt at fedoraproject.org> - 3.19.0-6
+* Tue Jan 18 2011 Alejandro Pérez <aeperezt at fedoraproject.org> - 3.19.0-9
 * 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