From 0bdb4980550685c23c4111ec1b0b1c3a60a622df Mon Sep 17 00:00:00 2001 From: "David I. Lehn" Date: Mon, 7 Jan 2002 22:35:26 +0000 Subject: [PATCH] remove a cvs merge leftover Original commit message from CVS: remove a cvs merge leftover --- ChangeLog | 1 - 1 file changed, 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index cc096a6364..61f1a9bd66 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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