fixup conflict indicators

diff --git a/ChangeLog b/ChangeLog
index ad4cef341d1dc1a0df0b36f0b79a5e6ddc7de45e..c18091b9f8353d24a0d02f8ec72e8b8738b9162b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -135,7 +135,6 @@ Tue Oct  5 17:06:26 2004  Tim Janik  <timj@gtk.org>
        call layout_clear_attributes, and also delegate calls to dependent
        cell layouts.  (#154191, Martyn Russell)
 
->>>>>>> 1.5869
 2004-10-01  Matthias Clasen  <mclasen@redhat.com>
 
        * modules/input/iminuktitut.c: Fix the spelling of Inuktitut

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index ad4cef341d1dc1a0df0b36f0b79a5e6ddc7de45e..c18091b9f8353d24a0d02f8ec72e8b8738b9162b 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -135,7 +135,6 @@ Tue Oct  5 17:06:26 2004  Tim Janik  <timj@gtk.org>
        call layout_clear_attributes, and also delegate calls to dependent
        cell layouts.  (#154191, Martyn Russell)
 
->>>>>>> 1.5869
 2004-10-01  Matthias Clasen  <mclasen@redhat.com>
 
        * modules/input/iminuktitut.c: Fix the spelling of Inuktitut

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index ad4cef341d1dc1a0df0b36f0b79a5e6ddc7de45e..c18091b9f8353d24a0d02f8ec72e8b8738b9162b 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -135,7 +135,6 @@ Tue Oct  5 17:06:26 2004  Tim Janik  <timj@gtk.org>
        call layout_clear_attributes, and also delegate calls to dependent
        cell layouts.  (#154191, Martyn Russell)
 
->>>>>>> 1.5869
 2004-10-01  Matthias Clasen  <mclasen@redhat.com>
 
        * modules/input/iminuktitut.c: Fix the spelling of Inuktitut

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index ad4cef341d1dc1a0df0b36f0b79a5e6ddc7de45e..c18091b9f8353d24a0d02f8ec72e8b8738b9162b 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -135,7 +135,6 @@ Tue Oct  5 17:06:26 2004  Tim Janik  <timj@gtk.org>
        call layout_clear_attributes, and also delegate calls to dependent
        cell layouts.  (#154191, Martyn Russell)
 
->>>>>>> 1.5869
 2004-10-01  Matthias Clasen  <mclasen@redhat.com>
 
        * modules/input/iminuktitut.c: Fix the spelling of Inuktitut