remove a cvs merge leftover

Original commit message from CVS:
remove a cvs merge leftover
This commit is contained in:
David I. Lehn 2002-01-07 22:35:26 +00:00
parent 57bbd90819
commit 0bdb498055

View file

@ -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