aboutsummaryrefslogtreecommitdiff
path: root/gcc/java/gjavah.c
diff options
context:
space:
mode:
authorJason Merrill <jason@gcc.gnu.org>1999-04-15 01:55:59 -0400
committerJason Merrill <jason@gcc.gnu.org>1999-04-15 01:55:59 -0400
commitfb8708d7b74bc42547e4bf31ed4f27f19add0efc (patch)
treeb8af04949e1b1f547526fafd1d1f33673f81893b /gcc/java/gjavah.c
parentb607c87f1f37f933244bcdfa6ac83ef1a8ec6fda (diff)
downloadgcc-fb8708d7b74bc42547e4bf31ed4f27f19add0efc.zip
gcc-fb8708d7b74bc42547e4bf31ed4f27f19add0efc.tar.gz
gcc-fb8708d7b74bc42547e4bf31ed4f27f19add0efc.tar.bz2
remove conflict indicators
From-SVN: r26473
Diffstat (limited to 'gcc/java/gjavah.c')
0 files changed, 0 insertions, 0 deletions