diff options
author | Bryce McKinlay <bryce@gcc.gnu.org> | 2002-03-16 21:04:28 +0000 |
---|---|---|
committer | Bryce McKinlay <bryce@gcc.gnu.org> | 2002-03-16 21:04:28 +0000 |
commit | c2765075dbaf9350c3a37c68d634fd24c43b94a9 (patch) | |
tree | 4fd7ffd4011ab0b3250e2fb811ee2fc720b4eeff /libjava/java/sql/SQLData.java | |
parent | 3bb656728597694f7b2ea7d9c72787fe0800cc96 (diff) | |
download | gcc-c2765075dbaf9350c3a37c68d634fd24c43b94a9.zip gcc-c2765075dbaf9350c3a37c68d634fd24c43b94a9.tar.gz gcc-c2765075dbaf9350c3a37c68d634fd24c43b94a9.tar.bz2 |
Remove conflict indicator.
From-SVN: r50893
Diffstat (limited to 'libjava/java/sql/SQLData.java')
0 files changed, 0 insertions, 0 deletions