mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-02-17 11:45:25 +00:00
remove conflict indicator
Original commit message from CVS: remove conflict indicator
This commit is contained in:
parent
08f49d1eba
commit
aa8a5cb824
1 changed files with 0 additions and 1 deletions
|
@ -68,7 +68,6 @@
|
|||
* ext/annodex/gstskeltag.h:
|
||||
Deleted; these files aren't used any more either.
|
||||
|
||||
>>>>>>> 1.2189
|
||||
2006-02-25 Julien MOUTTE <julien@moutte.net>
|
||||
|
||||
* ext/Makefile.am: Fix dist-check.
|
||||
|
|
Loading…
Reference in a new issue