diff options
| author | schwab <schwab@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-06-16 10:45:58 +0000 |
|---|---|---|
| committer | schwab <schwab@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-06-16 10:45:58 +0000 |
| commit | f36ac1babad0f221882af5fae06490386b1d2e31 (patch) | |
| tree | c5c381c1780c7f554d92b4a9a7f6bcae8264b5c8 /libjava/java/sql/DriverPropertyInfo.java | |
| parent | c1513f4f05dc3f73c3a1ad391d9c6f5b9f877654 (diff) | |
| download | ppe42-gcc-f36ac1babad0f221882af5fae06490386b1d2e31.tar.gz ppe42-gcc-f36ac1babad0f221882af5fae06490386b1d2e31.zip | |
Remove conflict marker.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@83234 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java/sql/DriverPropertyInfo.java')
0 files changed, 0 insertions, 0 deletions
