From 67ff460c0e5a2979a482cb6edd32d7e012f83b75 Mon Sep 17 00:00:00 2001 From: Jonathan Blandford Date: Tue, 18 Sep 2001 23:00:32 +0000 Subject: [PATCH] remove conflict marker from ChangeLog --- ChangeLog | 3 +-- ChangeLog.pre-2-0 | 3 +-- ChangeLog.pre-2-10 | 3 +-- ChangeLog.pre-2-2 | 3 +-- ChangeLog.pre-2-4 | 3 +-- ChangeLog.pre-2-6 | 3 +-- ChangeLog.pre-2-8 | 3 +-- 7 files changed, 7 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 39686f82ee..8fe10fdaac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -35,8 +35,7 @@ Wed Sep 12 11:21:14 2001 Owen Taylor * gtk/gtktext.c gtk/gtklabel.c: Use gtk_style_get_font() instead of style->font. - ->>>>>>> 1.2293 + Tue Sep 18 13:51:35 2001 Jonathan Blandford * gtk/gtkcellrenderer.h (enum): Get rid of broken "can_edit" and diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 39686f82ee..8fe10fdaac 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -35,8 +35,7 @@ Wed Sep 12 11:21:14 2001 Owen Taylor * gtk/gtktext.c gtk/gtklabel.c: Use gtk_style_get_font() instead of style->font. - ->>>>>>> 1.2293 + Tue Sep 18 13:51:35 2001 Jonathan Blandford * gtk/gtkcellrenderer.h (enum): Get rid of broken "can_edit" and diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 39686f82ee..8fe10fdaac 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -35,8 +35,7 @@ Wed Sep 12 11:21:14 2001 Owen Taylor * gtk/gtktext.c gtk/gtklabel.c: Use gtk_style_get_font() instead of style->font. - ->>>>>>> 1.2293 + Tue Sep 18 13:51:35 2001 Jonathan Blandford * gtk/gtkcellrenderer.h (enum): Get rid of broken "can_edit" and diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 39686f82ee..8fe10fdaac 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -35,8 +35,7 @@ Wed Sep 12 11:21:14 2001 Owen Taylor * gtk/gtktext.c gtk/gtklabel.c: Use gtk_style_get_font() instead of style->font. - ->>>>>>> 1.2293 + Tue Sep 18 13:51:35 2001 Jonathan Blandford * gtk/gtkcellrenderer.h (enum): Get rid of broken "can_edit" and diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 39686f82ee..8fe10fdaac 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -35,8 +35,7 @@ Wed Sep 12 11:21:14 2001 Owen Taylor * gtk/gtktext.c gtk/gtklabel.c: Use gtk_style_get_font() instead of style->font. - ->>>>>>> 1.2293 + Tue Sep 18 13:51:35 2001 Jonathan Blandford * gtk/gtkcellrenderer.h (enum): Get rid of broken "can_edit" and diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 39686f82ee..8fe10fdaac 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -35,8 +35,7 @@ Wed Sep 12 11:21:14 2001 Owen Taylor * gtk/gtktext.c gtk/gtklabel.c: Use gtk_style_get_font() instead of style->font. - ->>>>>>> 1.2293 + Tue Sep 18 13:51:35 2001 Jonathan Blandford * gtk/gtkcellrenderer.h (enum): Get rid of broken "can_edit" and diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 39686f82ee..8fe10fdaac 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -35,8 +35,7 @@ Wed Sep 12 11:21:14 2001 Owen Taylor * gtk/gtktext.c gtk/gtklabel.c: Use gtk_style_get_font() instead of style->font. - ->>>>>>> 1.2293 + Tue Sep 18 13:51:35 2001 Jonathan Blandford * gtk/gtkcellrenderer.h (enum): Get rid of broken "can_edit" and