diff options
| author | Christopher Faylor <me@cgf.cx> | 2001-10-24 15:40:24 +0000 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2001-10-24 15:40:24 +0000 |
| commit | a83037821314fead515198f88a9b83e29e66ca2f (patch) | |
| tree | aa5759ecad4b97e9af75cb191c91e2605a89501d /newlib | |
| parent | a0626ebe27cd82210cf73434e518b258b59dcdb7 (diff) | |
| download | newlib-a83037821314fead515198f88a9b83e29e66ca2f.zip newlib-a83037821314fead515198f88a9b83e29e66ca2f.tar.gz newlib-a83037821314fead515198f88a9b83e29e66ca2f.tar.bz2 | |
Remove merge conflict indicator.
Diffstat (limited to 'newlib')
0 files changed, 0 insertions, 0 deletions