[syncevolution: 2/2] fix merge

[Peter Robinson]

commit 1e737cdd98d52a937471f8dbbd0e8a55296ea44e
Merge: 6337163 2e47b05
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Fri Sep 16 11:48:47 2011 +0100

    fix merge

 syncevolution.spec |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
---
diff --cc syncevolution.spec
index 138d293,6510bd7..532bac0
--- a/syncevolution.spec
+++ b/syncevolution.spec
@@@ -185,9 -185,12 +185,15 @@@ desktop-file-validate %{buildroot}/%{_d
  %{_datadir}/syncevolution/xml/*.pl
  
  %changelog
 +* 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
+ 
+ * Mon Aug 29 2011 Milan Crha <mcrha at redhat.com> - 1:1.1.99.6-2
+ - Rebuild against newer evolution-data-server
+ 
  * Thu Aug 18 2011 Peter Robinson <pbrobinson at fedoraproject.org> - 1:1.1.99.6-1
  - update to 1.1.99.6
  - Add static libs to devel as they are needed for dev :-/ Fixes # 715131