[syncevolution/f16: 8/8] fix merge

[Peter Robinson]

commit 5a47e08c6487047b4b93f2d65ce3d9d0c248f2db
Merge: 15b4f37 a801686
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Thu Oct 13 13:42:44 2011 +0100

    fix merge

 syncevolution.spec |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --cc syncevolution.spec
index 66660a5,594af99..dcc51c7
--- a/syncevolution.spec
+++ b/syncevolution.spec
@@@ -182,14 -185,8 +182,14 @@@ desktop-file-validate %{buildroot}/%{_d
  %{_datadir}/syncevolution/xml/*.pl
  
  %changelog
 +* Thu Oct 13 2011 Peter Robinson <pbrobinson at fedoraproject.org> - 1:1.1.99.7-2
 +- Own syncevolution directory - fixes RHBZ 744929
 +
 +* Fri Sep 16 2011 Peter Robinson <pbrobinson at fedoraproject.org> - 1:1.1.99.7-1
 +- update to 1.1.99.7
 +
  * Tue Aug 30 2011 Milan Crha <mcrha at redhat.com> - 1:1.1.99.6-3
- - Sync version with f16 branch
+ - Rebuild against newer evolution-data-server (once again)
  
  * Mon Aug 29 2011 Milan Crha <mcrha at redhat.com> - 1:1.1.99.6-2
  - Rebuild against newer evolution-data-server