rpms/stellarium/devel stellarium.spec,1.60,1.61

[Jochen Schmitt]

Author: s4504kr

Update of /cvs/extras/rpms/stellarium/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30934

Modified Files:
	stellarium.spec 
Log Message:
Updated program documentation


Index: stellarium.spec
===================================================================
RCS file: /cvs/extras/rpms/stellarium/devel/stellarium.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- stellarium.spec	24 Sep 2009 20:42:16 -0000	1.60
+++ stellarium.spec	24 Sep 2009 20:43:01 -0000	1.61
@@ -107,7 +107,6 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING stellarium_user_guide-%{guidever}.pdf
 
 %changelog
-<<<<<<< stellarium.spec
 * Thu Sep 24 2009 Jochen Schmitt <Jochen herr-schmitt de> 0.10.2-5
 - Updated program documentation (#525302)