From 4117e38789a89ae63f51b459804fa7737064d528 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Mon, 7 Oct 2002 20:17:15 +0000 Subject: [PATCH] Fix a conflict indicator --- ChangeLog | 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 - 6 files changed, 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0c6b57681b..55489ee86d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -464,7 +464,6 @@ Mon Aug 5 17:01:30 2002 Owen Taylor * gdk/linux-fb/Makefile.am: Remove LDFLAGS setting. ->>>>>>> 1.3338.2.155 2002-08-01 Sven Neumann * gdk/gdkrgb.c: trivial changes to some debug code so it compiles diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 0c6b57681b..55489ee86d 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -464,7 +464,6 @@ Mon Aug 5 17:01:30 2002 Owen Taylor * gdk/linux-fb/Makefile.am: Remove LDFLAGS setting. ->>>>>>> 1.3338.2.155 2002-08-01 Sven Neumann * gdk/gdkrgb.c: trivial changes to some debug code so it compiles diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 0c6b57681b..55489ee86d 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -464,7 +464,6 @@ Mon Aug 5 17:01:30 2002 Owen Taylor * gdk/linux-fb/Makefile.am: Remove LDFLAGS setting. ->>>>>>> 1.3338.2.155 2002-08-01 Sven Neumann * gdk/gdkrgb.c: trivial changes to some debug code so it compiles diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 0c6b57681b..55489ee86d 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -464,7 +464,6 @@ Mon Aug 5 17:01:30 2002 Owen Taylor * gdk/linux-fb/Makefile.am: Remove LDFLAGS setting. ->>>>>>> 1.3338.2.155 2002-08-01 Sven Neumann * gdk/gdkrgb.c: trivial changes to some debug code so it compiles diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 0c6b57681b..55489ee86d 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -464,7 +464,6 @@ Mon Aug 5 17:01:30 2002 Owen Taylor * gdk/linux-fb/Makefile.am: Remove LDFLAGS setting. ->>>>>>> 1.3338.2.155 2002-08-01 Sven Neumann * gdk/gdkrgb.c: trivial changes to some debug code so it compiles diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 0c6b57681b..55489ee86d 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -464,7 +464,6 @@ Mon Aug 5 17:01:30 2002 Owen Taylor * gdk/linux-fb/Makefile.am: Remove LDFLAGS setting. ->>>>>>> 1.3338.2.155 2002-08-01 Sven Neumann * gdk/gdkrgb.c: trivial changes to some debug code so it compiles