From b93064153965550b747f65ee078e2b9435491c2e Mon Sep 17 00:00:00 2001
From: Thomas Leonard <talex5@gmail.com>
Date: Sun, 1 May 2005 11:38:35 +0000
Subject: [PATCH] r3902: Removed merge artifact.

---
 ROX-Filer/Help/Changes | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/ROX-Filer/Help/Changes b/ROX-Filer/Help/Changes
index f4e7ec0f..703ae0a5 100644
--- a/ROX-Filer/Help/Changes
+++ b/ROX-Filer/Help/Changes
@@ -21,9 +21,6 @@ Bugfix: Don't try to move directories that aren't there, but make symbolic
 Old choices_find_path_load/save now static, use new XDG functions exclusively
 (Stephen Watson).
 
-01-May-2005
-~~~~~~~~~~~
-
 25-Apr-2005
 ~~~~~~~~~~~
 Change over from CHOICESPATH to XDG_CONFIG_HOME and XDG_CONFIG_DIRS (Stephen
-- 
2.11.4.GIT