Fix a conflict indicator

2002-10-07 20:17:15 +00:00
parent e3e93f6362
commit 4117e38789
6 changed files with 0 additions and 6 deletions
--- a/1
+++ b/1
@@ -464,7 +464,6 @@ Mon Aug  5 17:01:30 2002  Owen Taylor  <otaylor@redhat.com>

 	* gdk/linux-fb/Makefile.am: Remove LDFLAGS setting.

->>>>>>> 1.3338.2.155
 2002-08-01  Sven Neumann  <sven@gimp.org>

 	* gdk/gdkrgb.c: trivial changes to some debug code so it compiles
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -464,7 +464,6 @@ Mon Aug  5 17:01:30 2002  Owen Taylor  <otaylor@redhat.com>

 	* gdk/linux-fb/Makefile.am: Remove LDFLAGS setting.

->>>>>>> 1.3338.2.155
 2002-08-01  Sven Neumann  <sven@gimp.org>

 	* gdk/gdkrgb.c: trivial changes to some debug code so it compiles
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -464,7 +464,6 @@ Mon Aug  5 17:01:30 2002  Owen Taylor  <otaylor@redhat.com>

 	* gdk/linux-fb/Makefile.am: Remove LDFLAGS setting.

->>>>>>> 1.3338.2.155
 2002-08-01  Sven Neumann  <sven@gimp.org>

 	* gdk/gdkrgb.c: trivial changes to some debug code so it compiles
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -464,7 +464,6 @@ Mon Aug  5 17:01:30 2002  Owen Taylor  <otaylor@redhat.com>

 	* gdk/linux-fb/Makefile.am: Remove LDFLAGS setting.

->>>>>>> 1.3338.2.155
 2002-08-01  Sven Neumann  <sven@gimp.org>

 	* gdk/gdkrgb.c: trivial changes to some debug code so it compiles
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -464,7 +464,6 @@ Mon Aug  5 17:01:30 2002  Owen Taylor  <otaylor@redhat.com>

 	* gdk/linux-fb/Makefile.am: Remove LDFLAGS setting.

->>>>>>> 1.3338.2.155
 2002-08-01  Sven Neumann  <sven@gimp.org>

 	* gdk/gdkrgb.c: trivial changes to some debug code so it compiles
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -464,7 +464,6 @@ Mon Aug  5 17:01:30 2002  Owen Taylor  <otaylor@redhat.com>

 	* gdk/linux-fb/Makefile.am: Remove LDFLAGS setting.

->>>>>>> 1.3338.2.155
 2002-08-01  Sven Neumann  <sven@gimp.org>

 	* gdk/gdkrgb.c: trivial changes to some debug code so it compiles