[gst-cvs] soto gst-plugins-ugly: gst-plugins-ugly/

[Martin Soto]

CVS Root:       /cvs/gstreamer
Module:         gst-plugins-ugly
Changes by:     soto
Date:           Thu Nov 24 2005  05:59:08 PST

Log message:
Erase old CVS conflict line.

Modified files:
    .               : ChangeLog

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-ugly/ChangeLog.diff?r1=1.1898&r2=1.1899