[python-qpid: 2/2] resolve conflict

[Nuno Santos]

commit 96d1cd1359f5c616d76364539f1522abc17aa676
Merge: f04baed 3554b38
Author: Nuno Santos <nsantos at redhat.com>
Date:   Tue Feb 15 17:22:38 2011 -0500

    resolve conflict

 python-qpid.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc python-qpid.spec
index c46016b,db463dd..d899421
--- a/python-qpid.spec
+++ b/python-qpid.spec
@@@ -3,7 -3,7 +3,7 @@@
  
  Name:           python-qpid
  Version:        0.8
--Release:        3%{?dist}
++Release:        4%{?dist}
  Summary:        Python client library for AMQP
  
  Group:          Development/Python
@@@ -60,9 -56,9 +60,12 @@@ rm -rf $RPM_BUILD_ROO
  %endif
  
  %changelog
- * Tue Feb 15 2011 Nuno Santos <nsantos at redhat.com> - 0.8-3
++* Tue Feb 15 2011 Nuno Santos <nsantos at redhat.com> - 0.8-4
 +- Qmf-related patch
 +
+ * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8-3
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ 
  * Tue Jan 11 2011 Nuno Santos <nsantos at redhat.com> - 0.8-2
  - Add qmf-related files