Conflict markers

diff --git a/ChangeLog b/ChangeLog
index 90cd56e70480ad69f87584bdf67da9cb6991057e..6f411ab779ddaaa5dac12735eefd7424552fe46c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -90,7 +90,6 @@ Wed Dec 22 01:24:01 2004  Jonathan Blandford  <jrb@redhat.com>
        (gtk_about_dialog_init): Add missing initializations.  (#161646,
        Torsten Schoenfeld)
 
->>>>>>> 1.6233
 2004-12-16  Matthias Clasen  <mclasen@redhat.com>
 
        * configure.in: Bump version

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 90cd56e70480ad69f87584bdf67da9cb6991057e..6f411ab779ddaaa5dac12735eefd7424552fe46c 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -90,7 +90,6 @@ Wed Dec 22 01:24:01 2004  Jonathan Blandford  <jrb@redhat.com>
        (gtk_about_dialog_init): Add missing initializations.  (#161646,
        Torsten Schoenfeld)
 
->>>>>>> 1.6233
 2004-12-16  Matthias Clasen  <mclasen@redhat.com>
 
        * configure.in: Bump version

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 90cd56e70480ad69f87584bdf67da9cb6991057e..6f411ab779ddaaa5dac12735eefd7424552fe46c 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -90,7 +90,6 @@ Wed Dec 22 01:24:01 2004  Jonathan Blandford  <jrb@redhat.com>
        (gtk_about_dialog_init): Add missing initializations.  (#161646,
        Torsten Schoenfeld)
 
->>>>>>> 1.6233
 2004-12-16  Matthias Clasen  <mclasen@redhat.com>
 
        * configure.in: Bump version

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 90cd56e70480ad69f87584bdf67da9cb6991057e..6f411ab779ddaaa5dac12735eefd7424552fe46c 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -90,7 +90,6 @@ Wed Dec 22 01:24:01 2004  Jonathan Blandford  <jrb@redhat.com>
        (gtk_about_dialog_init): Add missing initializations.  (#161646,
        Torsten Schoenfeld)
 
->>>>>>> 1.6233
 2004-12-16  Matthias Clasen  <mclasen@redhat.com>
 
        * configure.in: Bump version