aboutsummaryrefslogtreecommitdiff
path: root/libjava/java/text
diff options
context:
space:
mode:
authorJeffrey D. Oldham <oldham@gcc.gnu.org>2001-01-10 00:51:39 +0000
committerJeffrey D. Oldham <oldham@gcc.gnu.org>2001-01-10 00:51:39 +0000
commitc4923b10a80fda0edd35e2bab3749672f697e855 (patch)
tree78252757959d0b6dc97d82d87cf05b60f6f17b83 /libjava/java/text
parent3ee816a413e346dda445add7874f0e43c7353a4c (diff)
downloadgcc-c4923b10a80fda0edd35e2bab3749672f697e855.zip
gcc-c4923b10a80fda0edd35e2bab3749672f697e855.tar.gz
gcc-c4923b10a80fda0edd35e2bab3749672f697e855.tar.bz2
Remove unintentional merge indicators.
From-SVN: r38845
Diffstat (limited to 'libjava/java/text')
0 files changed, 0 insertions, 0 deletions