[qpid-cpp] Updated qmf patch

[Nuno Santos]

commit 090eb0526567cbe6517a6ac8a31e38ced55d2d80
Author: Nuno Santos <nsantos at redhat.com>
Date:   Mon Feb 14 12:55:59 2011 -0500

    Updated qmf patch

 qpid-cpp.spec |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
---
diff --git a/qpid-cpp.spec b/qpid-cpp.spec
index 3e35200..6f7bddc 100644
--- a/qpid-cpp.spec
+++ b/qpid-cpp.spec
@@ -1105,7 +1105,6 @@ rm -rf %{buildroot}
 %postun -p /sbin/ldconfig
 
 %changelog
-<<<<<<< HEAD
 * Mon Feb 14 2011 Nuno Santos <nsantos at redhat.com> - 0.8-5
 - Updated qmf patch