diff options
| author | neroden <neroden@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-08-03 20:33:52 +0000 |
|---|---|---|
| committer | neroden <neroden@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-08-03 20:33:52 +0000 |
| commit | 1756faab98165ac0812a21dd0c42923dd10d3a62 (patch) | |
| tree | af8a7d775180ee48a8e30e93fceee9a9966be981 /libffi/acinclude.m4 | |
| parent | b0b8d1803b005ed131387ea9a9880757cd2b4b77 (diff) | |
| download | gcc-1756faab98165ac0812a21dd0c42923dd10d3a62.tar.gz | |
Remove spurious conflict marker
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@85499 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libffi/acinclude.m4')
0 files changed, 0 insertions, 0 deletions