remove conflict indicator

Original commit message from CVS:
remove conflict indicator
This commit is contained in:
Christian Schaller 2006-02-28 10:40:01 +00:00
parent 08f49d1eba
commit aa8a5cb824

View file

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