From 3eac42f2d40ee410926d6cb620de62ce014c33bc Mon Sep 17 00:00:00 2001 From: Kristian Rietveld Date: Wed, 26 Apr 2006 12:22:01 +0000 Subject: [PATCH] remove conflict marker --- ChangeLog | 1 - ChangeLog.pre-2-10 | 1 - 2 files changed, 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9a57050682..fea09797e2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -136,7 +136,6 @@ Tue Apr 25 10:25:28 2006 Søren Sandmann * gtk/gtkprinter.c: Don't ref the backend since the backend owns the printer. ->>>>>>> 1.7779 2006-04-24 Alexander Larsson * gtk/gtkpagesetupunixdialog.c (update_combo_sensitivity_from_printers): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 9a57050682..fea09797e2 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -136,7 +136,6 @@ Tue Apr 25 10:25:28 2006 Søren Sandmann * gtk/gtkprinter.c: Don't ref the backend since the backend owns the printer. ->>>>>>> 1.7779 2006-04-24 Alexander Larsson * gtk/gtkpagesetupunixdialog.c (update_combo_sensitivity_from_printers):