diff options
| author | bje <bje@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-08-15 00:40:52 +0000 |
|---|---|---|
| committer | bje <bje@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-08-15 00:40:52 +0000 |
| commit | d901e1272189dff7077842cebcc8aa745092edd0 (patch) | |
| tree | c5a89b70916d7fa6f6e1bedcba6fb69e6eda0b4b /libjava/classpath/lib/java/sql/SQLPermission.class | |
| parent | aeeca85eb7c2d7b8b17804b0757f8c507128d2cc (diff) | |
| download | ppe42-gcc-d901e1272189dff7077842cebcc8aa745092edd0.tar.gz ppe42-gcc-d901e1272189dff7077842cebcc8aa745092edd0.zip | |
Remove stray conflict marker.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@127504 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/classpath/lib/java/sql/SQLPermission.class')
0 files changed, 0 insertions, 0 deletions
