diff options
| author | Steve Huston <shuston@riverace.com> | 2001-03-02 17:32:54 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2001-03-02 17:32:54 +0000 |
| commit | 601a7a4ec671835048b015d2294a53d441ea7f05 (patch) | |
| tree | de7de976d30e6eae6db6d5b6843ba30c0e12315e | |
| parent | 3f0c61d44a45bcdc7826a6b2504131008639a62f (diff) | |
| download | ATCD-601a7a4ec671835048b015d2294a53d441ea7f05.tar.gz | |
Removed remainign conflict indicator
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 1 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 1 |
3 files changed, 0 insertions, 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 <schmidt@ace.cs.wustl.edu> %s to be %*s since the string may not be nul terminated! Thanks to Lu Yunhai <luyunhai@huawei.com> for reporting this. ->>>>>>> 4.1657 Tue Feb 6 20:11:28 2001 Krishnakumar B <kitty@cs.wustl.edu> * 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 <schmidt@ace.cs.wustl.edu> %s to be %*s since the string may not be nul terminated! Thanks to Lu Yunhai <luyunhai@huawei.com> for reporting this. ->>>>>>> 4.1657 Tue Feb 6 20:11:28 2001 Krishnakumar B <kitty@cs.wustl.edu> * 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 <schmidt@ace.cs.wustl.edu> %s to be %*s since the string may not be nul terminated! Thanks to Lu Yunhai <luyunhai@huawei.com> for reporting this. ->>>>>>> 4.1657 Tue Feb 6 20:11:28 2001 Krishnakumar B <kitty@cs.wustl.edu> * include/makeinclude/platform_sunos5_sunc++.GNU: |