aboutsummaryrefslogtreecommitdiff
path: root/gcc/expr.h
diff options
context:
space:
mode:
authorAlexandre Oliva <oliva@gcc.gnu.org>1999-09-04 18:20:30 +0000
committerAlexandre Oliva <oliva@gcc.gnu.org>1999-09-04 18:20:30 +0000
commit482cbc74aacb9f764edb4d97722fb0df3c3fd73e (patch)
tree041baa370800e03dbb73a138f4a5a77dc7491b08 /gcc/expr.h
parente3de40e4c21f6f1a3bb8991499b660ab8ef1df64 (diff)
downloadgcc-482cbc74aacb9f764edb4d97722fb0df3c3fd73e.zip
gcc-482cbc74aacb9f764edb4d97722fb0df3c3fd73e.tar.gz
gcc-482cbc74aacb9f764edb4d97722fb0df3c3fd73e.tar.bz2
Clean up conflict marks introduced in revision 1.4254.
From-SVN: r29105
Diffstat (limited to 'gcc/expr.h')
0 files changed, 0 insertions, 0 deletions