From 601a7a4ec671835048b015d2294a53d441ea7f05 Mon Sep 17 00:00:00 2001 From: Steve Huston Date: Fri, 2 Mar 2001 17:32:54 +0000 Subject: Removed remainign conflict indicator --- ChangeLog | 1 - ChangeLogs/ChangeLog-02a | 1 - ChangeLogs/ChangeLog-03a | 1 - 3 files changed, 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0cde4421234..0b32cee47d9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1133,7 +1133,6 @@ Tue Feb 6 23:43:49 2001 Douglas C. Schmidt %s to be %*s since the string may not be nul terminated! Thanks to Lu Yunhai for reporting this. ->>>>>>> 4.1657 Tue Feb 6 20:11:28 2001 Krishnakumar B * include/makeinclude/platform_sunos5_sunc++.GNU: diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index 0cde4421234..0b32cee47d9 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1133,7 +1133,6 @@ Tue Feb 6 23:43:49 2001 Douglas C. Schmidt %s to be %*s since the string may not be nul terminated! Thanks to Lu Yunhai for reporting this. ->>>>>>> 4.1657 Tue Feb 6 20:11:28 2001 Krishnakumar B * include/makeinclude/platform_sunos5_sunc++.GNU: diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 0cde4421234..0b32cee47d9 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1133,7 +1133,6 @@ Tue Feb 6 23:43:49 2001 Douglas C. Schmidt %s to be %*s since the string may not be nul terminated! Thanks to Lu Yunhai for reporting this. ->>>>>>> 4.1657 Tue Feb 6 20:11:28 2001 Krishnakumar B * include/makeinclude/platform_sunos5_sunc++.GNU: -- cgit v1.2.1