[sugar-maze: 2/2] fix merge

[Peter Robinson]

commit 9b1fa0afd579ff552b3467084c7aa96b77978001
Merge: 85fb379 e037df8
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sun Jan 22 21:11:57 2012 +0000

    fix merge

 sugar-maze.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc sugar-maze.spec
index 65c2274,a8886ce..12bb895
--- a/sugar-maze.spec
+++ b/sugar-maze.spec
@@@ -42,9 -42,9 +42,12 @@@ mv player.py %{buildroot}%{sugaractivit
  %{sugaractivitydir}/Maze.activity/
  
  %changelog
 +* Sun Jan 22 2012 Peter Robinson <pbrobinson at fedoraproject.org> - 15-1
 +- Release 15
 +
+ * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 14-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
  * Sun Oct  2 2011 Peter Robinson <pbrobinson at fedoraproject.org> - 14-1
  - Release 14