diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2015-09-09 09:31:22 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2015-09-09 09:31:22 -0700 |
| commit | 76269ca7a63848aee1f141da75be8ca436bf9e6c (patch) | |
| tree | 3be0d1b978019ca825262a48bc4e18a34bdbf3f4 /test/files/run/nothingTypeNoOpt.scala | |
| parent | 17099706034d3ae2c63743488f076ed1dab286b7 (diff) | |
| parent | ad17b552b8f7c3a435ad8de71cd7268f905a1b8d (diff) | |
| download | scala-76269ca7a63848aee1f141da75be8ca436bf9e6c.tar.gz scala-76269ca7a63848aee1f141da75be8ca436bf9e6c.tar.bz2 scala-76269ca7a63848aee1f141da75be8ca436bf9e6c.zip | |
Merge pull request #4732 from SethTisue/merge-2.11.x-sep-8
Merge 2.11.x into 2.12.x [ci: last-only]
Diffstat (limited to 'test/files/run/nothingTypeNoOpt.scala')
| -rw-r--r-- | test/files/run/nothingTypeNoOpt.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/files/run/nothingTypeNoOpt.scala b/test/files/run/nothingTypeNoOpt.scala index 5c5a20fa3b..454539a4b1 100644 --- a/test/files/run/nothingTypeNoOpt.scala +++ b/test/files/run/nothingTypeNoOpt.scala @@ -26,7 +26,7 @@ class C { } def f5(x: Boolean) = { - // stack heights need to be the smae. ??? looks to the jvm like returning a value of + // stack heights need to be the same. ??? looks to the jvm like returning a value of // type Nothing$, need to drop or throw it. println( if (x) { ???; 10 } |