diff options
| author | Seth Nickell <seth@src.gnome.org> | 2002-01-28 21:20:45 +0000 |
|---|---|---|
| committer | Seth Nickell <seth@src.gnome.org> | 2002-01-28 21:20:45 +0000 |
| commit | 050a21b305420b7d36525e87dbbf487fb0762554 (patch) | |
| tree | 11a7b103beccee26316fc227232278bb25e59425 | |
| parent | 6b37d5721d63d29da00e6923695ddc43f5a63962 (diff) | |
| download | nautilus-050a21b305420b7d36525e87dbbf487fb0762554.tar.gz | |
remove a merge conflict marker from the ChangeLog
| -rw-r--r-- | ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -250,7 +250,6 @@ * icons/default/Makefile.am (SUBDIRS): remove since automake doesn't like an empty SUBDIRS ->>>>>>> 1.4957 2002-01-22 Darin Adler <darin@bentspoon.com> * libnautilus-private/nautilus-icon-factory.c: |