diff options
| author | aj <aj@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-03-19 20:02:52 +0000 |
|---|---|---|
| committer | aj <aj@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-03-19 20:02:52 +0000 |
| commit | 470eb7c99079528b085df7dbb12eab6f409bf0e7 (patch) | |
| tree | 5b247b53c392315d67b2079ec57fa98206dd5b78 /libjava/gnu/java/beans/info/ComponentBeanInfo.java | |
| parent | 4306c661e7615ac496f9d9343ea12902705c443c (diff) | |
| download | ppe42-gcc-470eb7c99079528b085df7dbb12eab6f409bf0e7.tar.gz ppe42-gcc-470eb7c99079528b085df7dbb12eab6f409bf0e7.zip | |
Remove conflict marker.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@51036 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/gnu/java/beans/info/ComponentBeanInfo.java')
0 files changed, 0 insertions, 0 deletions
