summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 78d34850c..0564ce68d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -105,7 +105,6 @@
* libnautilus-extensions/nautilus-program-choosing.c:
(get_xalf_prefix): Implemented, but not tested with xalf.
->>>>>>> 1.4478
2001-04-23 John Harper <jsh@eazel.com>
* components/news/nautilus-news.c (set_up_configure_widgets):