[sugar-abacus: 2/2] fix merge

[Peter Robinson]

commit 2ed2d10852e4747e79b76a8fd44483e46a57f462
Merge: 042c873 db09a89
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sat Jun 25 20:33:32 2011 +0100

    fix merge

 sugar-abacus.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc sugar-abacus.spec
index bb38845,578a53b..2dc89d5
--- a/sugar-abacus.spec
+++ b/sugar-abacus.spec
@@@ -51,9 -51,9 +51,12 @@@ rm -rf %{buildroot
  %{sugaractivitydir}/Abacus.activity/
  
  %changelog
 +* Sat Jun 25 2011 Peter Robinson <pbrobinson at gmail.com> - 20-1
 +- Update to 20
 +
+ * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 19-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ 
  * Mon Jan 31 2011 Peter Robinson <pbrobinson at gmail.com> - 19-1
  - Update to 19