[meego-panel-myzone: 2/2] fix merge

[Peter Robinson]

commit affd9d27bb162e15ce9dc366e0eaadc62ab78143
Merge: 9af3909 e5efbea
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Thu Oct 13 16:26:06 2011 +0100

    fix merge

 meego-panel-myzone.spec |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --cc meego-panel-myzone.spec
index d60393e,58b495b..9ddfc85
--- a/meego-panel-myzone.spec
+++ b/meego-panel-myzone.spec
@@@ -29,9 -29,9 +29,6 @@@ BuildRequires: desktop-file-util
  
  Requires: dbus
  
--Provides: moblin-panel-myzone = %{version}-%{release}
--Obsoletes: moblin-panel-myzone < 0.2.6
--
  %description
  The MeeGo panel for MyZone. MyZone allows you to see 
  that status of friends on social networks, chekck what you 
@@@ -96,9 -96,9 +93,12 @@@ desktop-file-validate %{buildroot}/%{_d
  %{_includedir}/%{name}
  
  %changelog
 +* Thu Oct 13 2011 Peter Robinson <pbrobinson at fedoraproject.org> - 0.2.9-1
 +- Release 0.2.9
 +
+ * Tue Aug 16 2011 Milan Crha <mcrha at redhat.com> 0.2.7-4
+ - Rebuild against new evolution-data-server
+ 
  * Mon Jun 20 2011 Milan Crha <mcrha at redhat.com> 0.2.7-3
  - Rebuild against new evolution-data-server