diff options
| author | zack <zack@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-06-05 17:00:32 +0000 |
|---|---|---|
| committer | zack <zack@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-06-05 17:00:32 +0000 |
| commit | a5380b83c9d0d99e1fc4ef6296c9adc6db9982b8 (patch) | |
| tree | 6e50fabf6f3019372dcba6479c945748e68257f0 /libjava/java/sql/DataTruncation.java | |
| parent | 850eae819aa156ab7bcfd2f5d2fa995b3caa3c40 (diff) | |
| download | ppe42-gcc-a5380b83c9d0d99e1fc4ef6296c9adc6db9982b8.tar.gz ppe42-gcc-a5380b83c9d0d99e1fc4ef6296c9adc6db9982b8.zip | |
Oops, remove conflict marker
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@34406 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java/sql/DataTruncation.java')
0 files changed, 0 insertions, 0 deletions
