aboutsummaryrefslogtreecommitdiff
path: root/gcc/expr.c
diff options
context:
space:
mode:
authorMatt Kraai <kraai@gcc.gnu.org>2003-05-30 00:50:32 +0000
committerMatt Kraai <kraai@gcc.gnu.org>2003-05-30 00:50:32 +0000
commit61d74548d6cb79c73d787f43835effe6f272991a (patch)
treebd948859aa9f0f0927ed54491077fb48c79e211a /gcc/expr.c
parent8fdf766886512c1558c3d7d3604c25d00fb8c943 (diff)
downloadgcc-61d74548d6cb79c73d787f43835effe6f272991a.zip
gcc-61d74548d6cb79c73d787f43835effe6f272991a.tar.gz
gcc-61d74548d6cb79c73d787f43835effe6f272991a.tar.bz2
Remove conflict marker.
From-SVN: r67239
Diffstat (limited to 'gcc/expr.c')
0 files changed, 0 insertions, 0 deletions