diff options
| author | Martin Soto <martinsoto@users.sourceforge.net> | 2005-11-24 13:58:55 +0000 |
|---|---|---|
| committer | Martin Soto <martinsoto@users.sourceforge.net> | 2005-11-24 13:58:55 +0000 |
| commit | 491c9ab3e01ff3aa8136cb10a953a308e48cf7cd (patch) | |
| tree | 2d4c791f78b59768b0a279af263b934ba9b6747e | |
| parent | f51be26aa8f3d1388a05dea850a40508c6fb8507 (diff) | |
Erase old CVS conflict line.
Original commit message from CVS:
Erase old CVS conflict line.
| -rw-r--r-- | ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -96,7 +96,6 @@ * ext/mad/Makefile.am: libgsttagedit => libgsttag ->>>>>>> 1.1895 2005-11-22 Edward Hervey <edward@fluendo.com> * ext/lame/gstlame.c: (gst_lame_sink_event): |