diff options
| author | oliva <oliva@138bc75d-0d04-0410-961f-82ee72b054a4> | 1999-09-04 18:20:30 +0000 |
|---|---|---|
| committer | oliva <oliva@138bc75d-0d04-0410-961f-82ee72b054a4> | 1999-09-04 18:20:30 +0000 |
| commit | 7086d72a013ca952df8d8d1aae2fb61e5a24d1a5 (patch) | |
| tree | 041baa370800e03dbb73a138f4a5a77dc7491b08 /gcc/c-common.h | |
| parent | 38f35d70fd770ee552e677ae8e2b2e9872468b8a (diff) | |
| download | ppe42-gcc-7086d72a013ca952df8d8d1aae2fb61e5a24d1a5.tar.gz ppe42-gcc-7086d72a013ca952df8d8d1aae2fb61e5a24d1a5.zip | |
Clean up conflict marks introduced in revision 1.4254.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@29105 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/c-common.h')
0 files changed, 0 insertions, 0 deletions
