aboutsummaryrefslogtreecommitdiff
path: root/libjava/java
diff options
context:
space:
mode:
authorRichard Henderson <rth@redhat.com>2005-05-03 12:03:06 -0700
committerRichard Henderson <rth@gcc.gnu.org>2005-05-03 12:03:06 -0700
commita5c4dfe2b36331abaff449f5ab3e3298a0346b5f (patch)
tree4711911e7c7264b51f83dfe4c2fb2198245bb698 /libjava/java
parentf384d65856a244b10696cc7b422a60156717cc9a (diff)
downloadgcc-a5c4dfe2b36331abaff449f5ab3e3298a0346b5f.zip
gcc-a5c4dfe2b36331abaff449f5ab3e3298a0346b5f.tar.gz
gcc-a5c4dfe2b36331abaff449f5ab3e3298a0346b5f.tar.bz2
* config/rs6000/rs6000.c: Remove conflict markers.
From-SVN: r99174
Diffstat (limited to 'libjava/java')
0 files changed, 0 insertions, 0 deletions