[sugar-read: 2/2] fix merge

[Peter Robinson]

commit 34a6a40ca37e35512655f0959c31a389c0b3a75d
Merge: aa751ba 63c4f35
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Thu Mar 8 14:13:44 2012 +0000

    fix merge

 sugar-read.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc sugar-read.spec
index 18e494e,9685c53..3a0a053
--- a/sugar-read.spec
+++ b/sugar-read.spec
@@@ -49,9 -47,9 +49,12 @@@ mkdir -p $RPM_BUILD_ROOT%{sugaractivity
  
  
  %changelog
 +* Thu Mar  8 2012 Peter Robinson <pbrobinson at fedoraproject.org> - 96-1
 +- Release 96
 +
+ * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 94-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
  * Thu Dec  8 2011 Peter Robinson <pbrobinson at fedoraproject.org> - 94-1
  - Release 94