diff options
| author | Lukas Rytz <lukas.rytz@gmail.com> | 2014-08-26 14:49:01 +0200 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@gmail.com> | 2014-08-26 14:49:01 +0200 |
| commit | e27d024c386c817030d872b9773171598e11dd8d (patch) | |
| tree | 6070bb44e3c87be079040dbf1e25f5bb2756703a /test/files/run/t6146b.check | |
| parent | 771724494d4a7e73542c04e8e0b50523745fb7a8 (diff) | |
| parent | 47908f19e064151140e32819c2edd9e68b34dd0c (diff) | |
| download | scala-e27d024c386c817030d872b9773171598e11dd8d.tar.gz scala-e27d024c386c817030d872b9773171598e11dd8d.tar.bz2 scala-e27d024c386c817030d872b9773171598e11dd8d.zip | |
Merge remote-tracking branch 'upstream/2.11.x' into backports
Conflicts:
src/library/scala/util/matching/Regex.scala
Diffstat (limited to 'test/files/run/t6146b.check')
| -rw-r--r-- | test/files/run/t6146b.check | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/files/run/t6146b.check b/test/files/run/t6146b.check index a3b09efcd9..6998873fb7 100644 --- a/test/files/run/t6146b.check +++ b/test/files/run/t6146b.check @@ -60,4 +60,4 @@ res2: u.Type = O.S3 scala> memType(S4, fTpe) res3: u.Type = S4 -scala> +scala> :quit |