diff options
| author | Christian Schaller <uraeus@gnome.org> | 2006-02-28 10:40:01 +0000 |
|---|---|---|
| committer | Christian Schaller <uraeus@gnome.org> | 2006-02-28 10:40:01 +0000 |
| commit | aa8a5cb824d4079061fd121d6cc2a0777c99a4dc (patch) | |
| tree | d688e98831ed4e0e55522ab9b77da39cb51b14dc | |
| parent | 08f49d1eba9828bb4c4dd054297d1239e52bb0ea (diff) | |
remove conflict indicator
Original commit message from CVS:
remove conflict indicator
| -rw-r--r-- | ChangeLog | 1 |
1 files changed, 0 insertions, 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. |