summaryrefslogtreecommitdiffstats
path: root/libjava/classpath/gnu/java/beans/encoder/GenericScannerState.java
diff options
context:
space:
mode:
authorhjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4>2007-10-30 17:54:29 +0000
committerhjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4>2007-10-30 17:54:29 +0000
commit2c03b0acbeff00d3cde74104382df749ea89a406 (patch)
tree16931e87ab66130b2d5b033d775ad7c19a1e6e0c /libjava/classpath/gnu/java/beans/encoder/GenericScannerState.java
parent2064e348bc4b1a9d4f5324fcdbeac18ca6c0468d (diff)
downloadppe42-gcc-2c03b0acbeff00d3cde74104382df749ea89a406.tar.gz
ppe42-gcc-2c03b0acbeff00d3cde74104382df749ea89a406.zip
Remove ">>>>>>> .r129772".
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@129777 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/classpath/gnu/java/beans/encoder/GenericScannerState.java')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud