[sugar-artwork: 2/2] fix merge

[Peter Robinson]

commit b37f509af36793d96f000342b48e356994c4655d
Merge: d82f8bc 531c523
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Wed Jul 2 14:52:04 2014 +0100

    fix merge

 sugar-artwork.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc sugar-artwork.spec
index da89923,a2e5f42..b2c8963
--- a/sugar-artwork.spec
+++ b/sugar-artwork.spec
@@@ -60,9 -62,9 +60,12 @@@ touch --no-create %{_datadir}/icons/sug
  %{_datadir}/themes/sugar-72/gtk-3.0/assets/*
  
  %changelog
 +* Wed Jul  2 2014 Peter Robinson <pbrobinson at fedoraproject.org> 0.102.0-1
 +- Sugar 0.102.0 stable release
 +
+ * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.101.4-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+ 
  * Sun Apr 13 2014 Peter Robinson <pbrobinson at fedoraproject.org> 0.101.4-1
  - 0.101.4 devel release