From 96ad6fc4bf0e4f925ec25581d64284552346cdad Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 7 Jul 2004 03:02:36 +0000 Subject: [PATCH] Remove conflict marker. --- ChangeLog | 1 - ChangeLog.pre-2-10 | 1 - ChangeLog.pre-2-6 | 1 - ChangeLog.pre-2-8 | 1 - 4 files changed, 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9b772a101c..00d76bdc05 100644 --- a/ChangeLog +++ b/ChangeLog @@ -228,7 +228,6 @@ Fri Jun 25 00:32:15 2004 Matthias Clasen (gtk_file_system_unix_uri_to_path): Likewise. (filename_to_path): Use remove_trailing_slash(). ->>>>>>> 1.5367.2.82 2004-06-22 Matthias Clasen * gtk/gtkaccelmap.c (_gtk_accel_path_is_valid): Accept diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 9b772a101c..00d76bdc05 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -228,7 +228,6 @@ Fri Jun 25 00:32:15 2004 Matthias Clasen (gtk_file_system_unix_uri_to_path): Likewise. (filename_to_path): Use remove_trailing_slash(). ->>>>>>> 1.5367.2.82 2004-06-22 Matthias Clasen * gtk/gtkaccelmap.c (_gtk_accel_path_is_valid): Accept diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 9b772a101c..00d76bdc05 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -228,7 +228,6 @@ Fri Jun 25 00:32:15 2004 Matthias Clasen (gtk_file_system_unix_uri_to_path): Likewise. (filename_to_path): Use remove_trailing_slash(). ->>>>>>> 1.5367.2.82 2004-06-22 Matthias Clasen * gtk/gtkaccelmap.c (_gtk_accel_path_is_valid): Accept diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 9b772a101c..00d76bdc05 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -228,7 +228,6 @@ Fri Jun 25 00:32:15 2004 Matthias Clasen (gtk_file_system_unix_uri_to_path): Likewise. (filename_to_path): Use remove_trailing_slash(). ->>>>>>> 1.5367.2.82 2004-06-22 Matthias Clasen * gtk/gtkaccelmap.c (_gtk_accel_path_is_valid): Accept