From 78c6308a01da27e159ff6c6ebe12660fc5472956 Mon Sep 17 00:00:00 2001 From: Manish Singh Date: Mon, 18 Feb 2002 20:32:58 +0000 Subject: [PATCH] ack, remove conflict marker --- 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 0a968ba9c1..37794a8ed8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,7 +11,6 @@ Mon Feb 18 14:40:22 2002 Owen Taylor stuck prelighting combine some common code for button release and pressing Escape. ->>>>>>> 1.3038 Mon Feb 18 14:17:59 2002 Owen Taylor * gtk/gtkclist.c (adjust_adjustments) diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 0a968ba9c1..37794a8ed8 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -11,7 +11,6 @@ Mon Feb 18 14:40:22 2002 Owen Taylor stuck prelighting combine some common code for button release and pressing Escape. ->>>>>>> 1.3038 Mon Feb 18 14:17:59 2002 Owen Taylor * gtk/gtkclist.c (adjust_adjustments) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 0a968ba9c1..37794a8ed8 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -11,7 +11,6 @@ Mon Feb 18 14:40:22 2002 Owen Taylor stuck prelighting combine some common code for button release and pressing Escape. ->>>>>>> 1.3038 Mon Feb 18 14:17:59 2002 Owen Taylor * gtk/gtkclist.c (adjust_adjustments) diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 0a968ba9c1..37794a8ed8 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -11,7 +11,6 @@ Mon Feb 18 14:40:22 2002 Owen Taylor stuck prelighting combine some common code for button release and pressing Escape. ->>>>>>> 1.3038 Mon Feb 18 14:17:59 2002 Owen Taylor * gtk/gtkclist.c (adjust_adjustments) diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 0a968ba9c1..37794a8ed8 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -11,7 +11,6 @@ Mon Feb 18 14:40:22 2002 Owen Taylor stuck prelighting combine some common code for button release and pressing Escape. ->>>>>>> 1.3038 Mon Feb 18 14:17:59 2002 Owen Taylor * gtk/gtkclist.c (adjust_adjustments) diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 0a968ba9c1..37794a8ed8 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -11,7 +11,6 @@ Mon Feb 18 14:40:22 2002 Owen Taylor stuck prelighting combine some common code for button release and pressing Escape. ->>>>>>> 1.3038 Mon Feb 18 14:17:59 2002 Owen Taylor * gtk/gtkclist.c (adjust_adjustments) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 0a968ba9c1..37794a8ed8 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -11,7 +11,6 @@ Mon Feb 18 14:40:22 2002 Owen Taylor stuck prelighting combine some common code for button release and pressing Escape. ->>>>>>> 1.3038 Mon Feb 18 14:17:59 2002 Owen Taylor * gtk/gtkclist.c (adjust_adjustments)