diff options
| author | Pavel Cisler <pce@src.gnome.org> | 2001-02-06 08:32:23 +0000 |
|---|---|---|
| committer | Pavel Cisler <pce@src.gnome.org> | 2001-02-06 08:32:23 +0000 |
| commit | f22c9d16b8b2b428b87726d805714e7ca8e8c44e (patch) | |
| tree | 8932bfc261a5bbf8e5d286c2d18eb39ec82bab40 | |
| parent | b8c2fe2095e90d222147085841c4d89a796cfb55 (diff) | |
| download | nautilus-f22c9d16b8b2b428b87726d805714e7ca8e8c44e.tar.gz | |
fix changelog conflict markers
| -rw-r--r-- | ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -828,7 +828,6 @@ Initiall check-in of new metadata APIs (corba) - not hooked up yet. ->>>>>>> 1.3621 2001-02-01 Gene Z. Ragan <gzr@eazel.com> reviewed by: Pavel Cisler <pavel@eazel.com> |