From c087b64c77b7fc2ac7aadf78c6f47eb2ba99c7a1 Mon Sep 17 00:00:00 2001 From: Robert Brady Date: Thu, 16 Nov 2000 00:47:38 +0000 Subject: [PATCH] Kill stray conflict line. --- 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 e3218278db..a5427d52f5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -55,7 +55,6 @@ Wed Nov 15 16:02:20 2000 Owen Taylor 2000-11-15 Havoc Pennington ->>>>>>> 1.1532 * gtk/gtktextview.c (changed_handler): offset redraw rect by xoffset in addition to yoffset, so horizontal scrolling doesn't break redraws diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index e3218278db..a5427d52f5 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -55,7 +55,6 @@ Wed Nov 15 16:02:20 2000 Owen Taylor 2000-11-15 Havoc Pennington ->>>>>>> 1.1532 * gtk/gtktextview.c (changed_handler): offset redraw rect by xoffset in addition to yoffset, so horizontal scrolling doesn't break redraws diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index e3218278db..a5427d52f5 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -55,7 +55,6 @@ Wed Nov 15 16:02:20 2000 Owen Taylor 2000-11-15 Havoc Pennington ->>>>>>> 1.1532 * gtk/gtktextview.c (changed_handler): offset redraw rect by xoffset in addition to yoffset, so horizontal scrolling doesn't break redraws diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index e3218278db..a5427d52f5 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -55,7 +55,6 @@ Wed Nov 15 16:02:20 2000 Owen Taylor 2000-11-15 Havoc Pennington ->>>>>>> 1.1532 * gtk/gtktextview.c (changed_handler): offset redraw rect by xoffset in addition to yoffset, so horizontal scrolling doesn't break redraws diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index e3218278db..a5427d52f5 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -55,7 +55,6 @@ Wed Nov 15 16:02:20 2000 Owen Taylor 2000-11-15 Havoc Pennington ->>>>>>> 1.1532 * gtk/gtktextview.c (changed_handler): offset redraw rect by xoffset in addition to yoffset, so horizontal scrolling doesn't break redraws diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index e3218278db..a5427d52f5 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -55,7 +55,6 @@ Wed Nov 15 16:02:20 2000 Owen Taylor 2000-11-15 Havoc Pennington ->>>>>>> 1.1532 * gtk/gtktextview.c (changed_handler): offset redraw rect by xoffset in addition to yoffset, so horizontal scrolling doesn't break redraws diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index e3218278db..a5427d52f5 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -55,7 +55,6 @@ Wed Nov 15 16:02:20 2000 Owen Taylor 2000-11-15 Havoc Pennington ->>>>>>> 1.1532 * gtk/gtktextview.c (changed_handler): offset redraw rect by xoffset in addition to yoffset, so horizontal scrolling doesn't break redraws