diff options
author | Andreas Schwab <schwab@linux-m68k.org> | 2009-01-19 09:42:13 +0000 |
---|---|---|
committer | Andreas Schwab <schwab@linux-m68k.org> | 2009-01-19 09:42:13 +0000 |
commit | b50494eedcee9cc4274e8af80cb9501a24c62300 (patch) | |
tree | f3e191f775f30e7d8883c20302e3720b58edd6db /newlib/libc/include/stdint.h | |
parent | 895d15b81e7443a15210e61fb6083c21f7b00f4b (diff) | |
download | cygnal-b50494eedcee9cc4274e8af80cb9501a24c62300.tar.gz cygnal-b50494eedcee9cc4274e8af80cb9501a24c62300.tar.bz2 cygnal-b50494eedcee9cc4274e8af80cb9501a24c62300.zip |
Remove conflict marker.
Diffstat (limited to 'newlib/libc/include/stdint.h')
0 files changed, 0 insertions, 0 deletions