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

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/lyx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11579

Modified Files:
	lyx.spec 
Log Message:
* Wed Jul 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.5.0-1
- lyx-1.5.0(final)



Index: lyx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/devel/lyx.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- lyx.spec	25 Jul 2007 15:58:08 -0000	1.60
+++ lyx.spec	25 Jul 2007 15:58:28 -0000	1.61
@@ -192,7 +192,6 @@
 * Fri May 18 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.5.0-0.6.beta3
 - lyx-1.5.0beta3
 
->>>>>>> 1.59
 * Sun Apr 22 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.5.0-0.5.beta2
 - lyx-1.5.0beta2