[sugar-chat: 2/2] fix merge

[Peter Robinson]

commit 00d6292987e7266bdbc5a1d4615962078006f778
Merge: 3115f79 675981d
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sat Mar 10 10:48:06 2012 +0000

    fix merge

 sugar-chat.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc sugar-chat.spec
index 9258673,b4d4c68..44f5f13
--- a/sugar-chat.spec
+++ b/sugar-chat.spec
@@@ -40,9 -40,9 +40,12 @@@ python ./setup.py install --prefix=$RPM
  
  
  %changelog
 +* Sat Mar 10 2012 Peter Robinson <pbrobinson at fedoraproject.org> - 74-1
 +- Release 74
 +
+ * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 73-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
  * Mon Oct 24 2011 Peter Robinson <pbrobinson at fedoraproject.org> - 73-1
  - Release 73