[coin-or-CoinMP] Correct wrong commit

[pcpa]

commit 7a7f174d3dcea4ae723c0a96f27710e180e97095
Author: pcpa <paulo.cesar.pereira.de.andrade at gmail.com>
Date:   Sun Feb 22 12:02:02 2015 -0300

    Correct wrong commit

 coin-or-CoinMP.spec | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)
---
diff --git a/coin-or-CoinMP.spec b/coin-or-CoinMP.spec
index a61d063..9b356e5 100644
--- a/coin-or-CoinMP.spec
+++ b/coin-or-CoinMP.spec
@@ -4,7 +4,7 @@ Name:		coin-or-%{module}
 Group:		Applications/Engineering
 Summary:	C-API interface to CLP, CBC and CGL
 Version:	1.7.6
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	CPL
 URL:		http://projects.coin-or.org/%{module}
 Source0:	http://www.coin-or.org/download/pkgsource/%{module}/%{module}-%{version}.tgz
@@ -81,21 +81,14 @@ make test
 %{_libdir}/pkgconfig/*
 
 %changelog
-<<<<<<< HEAD
-* Sat Feb 21 2015 pcpa <paulo.cesar.pereira.de.andrade at gmail.com> - 1.7.6-3
+* Sat Feb 21 2015 pcpa <paulo.cesar.pereira.de.andrade at gmail.com> - 1.7.6-4
 - Rebuild to ensure using latest C++ abi changes.
 
-* Tue Nov 11 2014 Caolán McNamara <caolanm at redht.com> - 1.7.6-2
-- Rebuild because coin-or-Clp is newer than this and the size of class
-  ClpSimplex changed since the last version => libreoffice's coinmp using
-  solver crashes
-=======
 * Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
->>>>>>> 915b7014226ecdc9c6c6ff14efc527ed11ba1584
 
 * Sat Apr 19 2014 pcpa <paulo.cesar.pereira.de.andrade at gmail.com> - 1.7.6-1
 - Update to latest upstream release.