diff options
| author | aleksandar <aleksandar@lampmac14.epfl.ch> | 2012-01-12 15:38:55 +0100 |
|---|---|---|
| committer | aleksandar <aleksandar@lampmac14.epfl.ch> | 2012-01-12 15:38:55 +0100 |
| commit | 91fcdf64d406aed26d473091c3328c0cf089e115 (patch) | |
| tree | e3897d0cc6b680d32581a740b16a4ad5ef0839ef /test/files/jvm | |
| parent | 51ddeb372b3f0b22041d9a51f3faee17acd7b749 (diff) | |
| parent | 5f5029d2ac6348ecb07fc11f6656621c662ced92 (diff) | |
| download | scala-91fcdf64d406aed26d473091c3328c0cf089e115.tar.gz scala-91fcdf64d406aed26d473091c3328c0cf089e115.tar.bz2 scala-91fcdf64d406aed26d473091c3328c0cf089e115.zip | |
Merge branch 'master' into issue/4147
Conflicts:
.gitignore
Diffstat (limited to 'test/files/jvm')
| -rw-r--r-- | test/files/jvm/xml03syntax.check | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/files/jvm/xml03syntax.check b/test/files/jvm/xml03syntax.check index 75dc539137..9fbedc2ae6 100644 --- a/test/files/jvm/xml03syntax.check +++ b/test/files/jvm/xml03syntax.check @@ -23,4 +23,4 @@ true 4 node=<elem key="<b>hello</b>"></elem>, key=Some(<b>hello</b>) -node=<elem ></elem>, key=None +node=<elem></elem>, key=None |