[gst-cvs] CVS: gstreamer ChangeLog,1.14,1.15

[David I. L. <dl...@us...>]

Update of /cvsroot/gstreamer/gstreamer
In directory usw-pr-cvs1:/tmp/cvs-serv27230

Modified Files:
	ChangeLog 
Log Message:
remove a cvs merge leftover


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gstreamer/gstreamer/ChangeLog,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- ChangeLog	2002/01/03 20:10:15	1.14
+++ ChangeLog	2002/01/07 22:35:26	1.15
@@ -133,7 +133,6 @@
 
 	* lots of build fixes for 0.3.0 release
 
->>>>>>> 1.3.2.2
 2001-08-15 23:43  cael
 
 	* gstplay/: ChangeLog, gstmediaplay.c, gstplay.c: Added hacky check