[rubygem-deltacloud-client: 2/2] Fixed conflict

[Michal Fojtik]

commit 331ad904cb60e821f4fe3a8b5e0b25747265e76b
Merge: 803de65 7ac5285
Author: Michal Fojtik <mi at mifo.sk>
Date:   Thu May 5 15:57:33 2011 +0200

    Fixed conflict

 rubygem-deltacloud-client.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc rubygem-deltacloud-client.spec
index 4ba819c,420397c..ed0fed8
--- a/rubygem-deltacloud-client.spec
+++ b/rubygem-deltacloud-client.spec
@@@ -71,9 -69,9 +71,12 @@@ rm -rf %{buildroot
  %{gemdir}/doc/%{gemname}-%{version}
  
  %changelog
 +* Thu May 05 2011 Michal Fojtik <mfojtik at redhat.com> - 0.3.0-1
 +- Version bump
 +
+ * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.1-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ 
  * Fri Feb 04 2011 Michal Fojtik <mfojtik at redhat.com> - 0.1.1-1
  - Version bump