From dc5a39b1369d6f56ea8675903f023896e5ac0dd9 Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Tue, 5 Oct 2004 17:31:10 +0000 Subject: [PATCH] fixup conflict indicators --- 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 ad4cef341d..c18091b9f8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -135,7 +135,6 @@ Tue Oct 5 17:06:26 2004 Tim Janik call layout_clear_attributes, and also delegate calls to dependent cell layouts. (#154191, Martyn Russell) ->>>>>>> 1.5869 2004-10-01 Matthias Clasen * modules/input/iminuktitut.c: Fix the spelling of Inuktitut diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index ad4cef341d..c18091b9f8 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -135,7 +135,6 @@ Tue Oct 5 17:06:26 2004 Tim Janik call layout_clear_attributes, and also delegate calls to dependent cell layouts. (#154191, Martyn Russell) ->>>>>>> 1.5869 2004-10-01 Matthias Clasen * modules/input/iminuktitut.c: Fix the spelling of Inuktitut diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index ad4cef341d..c18091b9f8 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -135,7 +135,6 @@ Tue Oct 5 17:06:26 2004 Tim Janik call layout_clear_attributes, and also delegate calls to dependent cell layouts. (#154191, Martyn Russell) ->>>>>>> 1.5869 2004-10-01 Matthias Clasen * modules/input/iminuktitut.c: Fix the spelling of Inuktitut diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index ad4cef341d..c18091b9f8 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -135,7 +135,6 @@ Tue Oct 5 17:06:26 2004 Tim Janik call layout_clear_attributes, and also delegate calls to dependent cell layouts. (#154191, Martyn Russell) ->>>>>>> 1.5869 2004-10-01 Matthias Clasen * modules/input/iminuktitut.c: Fix the spelling of Inuktitut