diff options
| author | Gerald Pfeifer <gerald@gcc.gnu.org> | 2000-11-09 08:48:30 +0000 |
|---|---|---|
| committer | Gerald Pfeifer <gerald@gcc.gnu.org> | 2000-11-09 08:48:30 +0000 |
| commit | 54d87db8696d7dd6307ba7f5e54ec27a22d42348 (patch) | |
| tree | ee0d730796d47c22fcc7a34ea4c19bfb6a016595 /libjava/java/sql/SQLWarning.java | |
| parent | 97dc9fc0df347fd40fbbbf3ba84cf172f551d80b (diff) | |
| download | gcc-54d87db8696d7dd6307ba7f5e54ec27a22d42348.zip gcc-54d87db8696d7dd6307ba7f5e54ec27a22d42348.tar.gz gcc-54d87db8696d7dd6307ba7f5e54ec27a22d42348.tar.bz2 | |
* Remove overlooked conflict marker.
From-SVN: r37337
Diffstat (limited to 'libjava/java/sql/SQLWarning.java')
0 files changed, 0 insertions, 0 deletions