diff options
| author | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-07-22 15:44:17 +0200 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-07-22 15:47:58 +0200 |
| commit | 078a1c5fae09970d22b886831e36745b7f7e25db (patch) | |
| tree | f9df2087dbf1984b83d122ce1a3e41a96e6f4920 /test/files/run/reflection-modulemirror-nested-badpath.check | |
| parent | e52fa7e652c175f561a1a0804e04b6d00b89aaa6 (diff) | |
| parent | fa4c1de6e7dc5e5703ccf822c5815da9e8ae47ed (diff) | |
| download | scala-078a1c5fae09970d22b886831e36745b7f7e25db.tar.gz scala-078a1c5fae09970d22b886831e36745b7f7e25db.tar.bz2 scala-078a1c5fae09970d22b886831e36745b7f7e25db.zip | |
Merge branch '2.10.x`
Conflicts:
test/files/run/existentials-in-compiler.scala
Diffstat (limited to 'test/files/run/reflection-modulemirror-nested-badpath.check')
| -rw-r--r-- | test/files/run/reflection-modulemirror-nested-badpath.check | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/files/run/reflection-modulemirror-nested-badpath.check b/test/files/run/reflection-modulemirror-nested-badpath.check index 16a5b10390..f7980b9986 100644 --- a/test/files/run/reflection-modulemirror-nested-badpath.check +++ b/test/files/run/reflection-modulemirror-nested-badpath.check @@ -1,2 +1,2 @@ -this is a static module, use reflectModule on a RuntimeMirror to obtain its ModuleMirror -() +object R is a static module, use reflectModule on a RuntimeMirror to obtain its ModuleMirror
+()
|