Remove conflict marker
Original commit message from CVS: Remove conflict marker
This commit is contained in:
parent
4feeea6c13
commit
e558623852
@ -51,7 +51,6 @@
|
||||
* gst-libs/gst/audio/audio.h:
|
||||
remove some deprecated functions
|
||||
|
||||
>>>>>>> 1.2127
|
||||
2005-11-22 Andy Wingo <wingo@pobox.com>
|
||||
|
||||
* Update for gst_tag_setter API changes.
|
||||
|
Loading…
x
Reference in New Issue
Block a user