[sugar-write: 2/2] fix merge

[Peter Robinson]

commit 632845622788461a58ee0d01724f0a4bd7943078
Merge: 151da66 78b04c4
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Mon Mar 19 11:18:02 2012 +0000

    fix merge

 sugar-write.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc sugar-write.spec
index 9dbb564,5dc0246..4c4e892
--- a/sugar-write.spec
+++ b/sugar-write.spec
@@@ -39,9 -39,9 +39,12 @@@ python ./setup.py install --prefix=$RPM
  
  
  %changelog
 +* Mon Mar 19 2012 Peter Robinson <pbrobinson at fedoraproject.org> - 78-1
 +- New 78 release
 +
+ * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 77-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
  * Sun Oct  2 2011 Peter Robinson <pbrobinson at fedoraproject.org> - 77-1
  - New 77 release