[stellarium: 2/2] Sove merge conflicts

[Jochen Schmitt]

commit 6737793f65fd8e5b6016176577bd21feaacc0f70
Merge: a54f620 90f7bbc
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date:   Tue Jul 5 20:52:40 2011 +0200

    Sove merge conflicts

 stellarium.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc stellarium.spec
index 0aa9115,b9e694b..3cc97b2
--- a/stellarium.spec
+++ b/stellarium.spec
@@@ -102,9 -102,9 +102,12 @@@ rm -rf $RPM_BUILD_ROO
  %doc COPYING stellarium_user_guide-%{guidever}.pdf
  
  %changelog
 +* Tue Jul  5 2011 Jochen Schmitt <Jochen herr-schmitt de> 0.11.0-1
 +- New upstream release
 +
+ * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10.6-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ 
  * Mon Dec  6 2010 Jochen Schmitt <Jochen herr-schmitt de> 0.10.6-1
  - New upstream release