aboutsummaryrefslogtreecommitdiff
path: root/gcc/c-common.c
diff options
context:
space:
mode:
authorGerald Pfeifer <gerald@gcc.gnu.org>2000-11-09 08:48:30 +0000
committerGerald Pfeifer <gerald@gcc.gnu.org>2000-11-09 08:48:30 +0000
commit54d87db8696d7dd6307ba7f5e54ec27a22d42348 (patch)
treeee0d730796d47c22fcc7a34ea4c19bfb6a016595 /gcc/c-common.c
parent97dc9fc0df347fd40fbbbf3ba84cf172f551d80b (diff)
downloadgcc-54d87db8696d7dd6307ba7f5e54ec27a22d42348.zip
gcc-54d87db8696d7dd6307ba7f5e54ec27a22d42348.tar.gz
gcc-54d87db8696d7dd6307ba7f5e54ec27a22d42348.tar.bz2
* Remove overlooked conflict marker.
From-SVN: r37337
Diffstat (limited to 'gcc/c-common.c')
0 files changed, 0 insertions, 0 deletions