rpms/eclipse-subclipse/devel eclipse-subclipse.spec,1.30,1.31

[Robert Marcano]

Author: robmv

Update of /cvs/extras/rpms/eclipse-subclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20939

Modified Files:
	eclipse-subclipse.spec 
Log Message:
fix bad merge



Index: eclipse-subclipse.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/devel/eclipse-subclipse.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- eclipse-subclipse.spec	6 Apr 2009 15:09:47 -0000	1.30
+++ eclipse-subclipse.spec	6 Apr 2009 15:11:14 -0000	1.31
@@ -123,15 +123,12 @@
 
 
 %changelog
-<<<<<<< eclipse-subclipse.spec
 * Mon Apr 26 2009 Robert Marcano <robert at marcanoonline.com> 1.6.0-1
 - Update to upstream 1.6.0
 
-=======
 * Mon Mar 23 2009 Alexander Kurtakov <akurtako at redhat.com> 1.4.7-4
 - Rebuild to not ship p2 context.xml.
 
->>>>>>> 1.29
 * Tue Feb 24 2009 Robert Marcano <robert at marcanoonline.com> 1.4.7-3
 - Update to upstream 1.4.7
 - eclipse-subclipse-book is obsoleted, not provided upstream