aboutsummaryrefslogtreecommitdiff
path: root/libjava/java/sql/SQLWarning.java
diff options
context:
space:
mode:
authorGeoffrey Keating <geoffk@gcc.gnu.org>2003-02-18 18:26:43 +0000
committerGeoffrey Keating <geoffk@gcc.gnu.org>2003-02-18 18:26:43 +0000
commitdce53c70a455e6067fbe6e1b22c3afd9b2676d19 (patch)
treee65e5dfb186aa1699e70d7584ceb20e9ca16a252 /libjava/java/sql/SQLWarning.java
parent59d22bc54ead399c3f918fa6d68fbbb045e14ead (diff)
downloadgcc-dce53c70a455e6067fbe6e1b22c3afd9b2676d19.zip
gcc-dce53c70a455e6067fbe6e1b22c3afd9b2676d19.tar.gz
gcc-dce53c70a455e6067fbe6e1b22c3afd9b2676d19.tar.bz2
Remove conflict marker
From-SVN: r63048
Diffstat (limited to 'libjava/java/sql/SQLWarning.java')
0 files changed, 0 insertions, 0 deletions