From 3cc89fb5ab49e7608ed141d0df159ec776a6d383 Mon Sep 17 00:00:00 2001 From: Matt Wilson Date: Wed, 31 Oct 2001 18:52:22 +0000 Subject: [PATCH] remove conflict moarker --- ChangeLog | 1 - ChangeLog.pre-2-0 | 1 - ChangeLog.pre-2-10 | 1 - ChangeLog.pre-2-2 | 1 - ChangeLog.pre-2-4 | 1 - ChangeLog.pre-2-6 | 1 - ChangeLog.pre-2-8 | 1 - 7 files changed, 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 715fd44031..5482dbcd7f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -217,7 +217,6 @@ Mon Oct 29 11:31:40 2001 Owen Taylor * docs/Changes-2.0.txt: add a little note about the GtkPreviewInfo changes ->>>>>>> 1.2483 Sun Oct 28 09:15:39 2001 Owen Taylor * gtk/gtkimcontext.h (struct _GtkIMContext): Fixed diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 715fd44031..5482dbcd7f 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -217,7 +217,6 @@ Mon Oct 29 11:31:40 2001 Owen Taylor * docs/Changes-2.0.txt: add a little note about the GtkPreviewInfo changes ->>>>>>> 1.2483 Sun Oct 28 09:15:39 2001 Owen Taylor * gtk/gtkimcontext.h (struct _GtkIMContext): Fixed diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 715fd44031..5482dbcd7f 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -217,7 +217,6 @@ Mon Oct 29 11:31:40 2001 Owen Taylor * docs/Changes-2.0.txt: add a little note about the GtkPreviewInfo changes ->>>>>>> 1.2483 Sun Oct 28 09:15:39 2001 Owen Taylor * gtk/gtkimcontext.h (struct _GtkIMContext): Fixed diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 715fd44031..5482dbcd7f 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -217,7 +217,6 @@ Mon Oct 29 11:31:40 2001 Owen Taylor * docs/Changes-2.0.txt: add a little note about the GtkPreviewInfo changes ->>>>>>> 1.2483 Sun Oct 28 09:15:39 2001 Owen Taylor * gtk/gtkimcontext.h (struct _GtkIMContext): Fixed diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 715fd44031..5482dbcd7f 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -217,7 +217,6 @@ Mon Oct 29 11:31:40 2001 Owen Taylor * docs/Changes-2.0.txt: add a little note about the GtkPreviewInfo changes ->>>>>>> 1.2483 Sun Oct 28 09:15:39 2001 Owen Taylor * gtk/gtkimcontext.h (struct _GtkIMContext): Fixed diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 715fd44031..5482dbcd7f 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -217,7 +217,6 @@ Mon Oct 29 11:31:40 2001 Owen Taylor * docs/Changes-2.0.txt: add a little note about the GtkPreviewInfo changes ->>>>>>> 1.2483 Sun Oct 28 09:15:39 2001 Owen Taylor * gtk/gtkimcontext.h (struct _GtkIMContext): Fixed diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 715fd44031..5482dbcd7f 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -217,7 +217,6 @@ Mon Oct 29 11:31:40 2001 Owen Taylor * docs/Changes-2.0.txt: add a little note about the GtkPreviewInfo changes ->>>>>>> 1.2483 Sun Oct 28 09:15:39 2001 Owen Taylor * gtk/gtkimcontext.h (struct _GtkIMContext): Fixed