summaryrefslogtreecommitdiff
path: root/test/files/neg/t836.scala
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2015-07-13 10:42:58 -0700
committerAdriaan Moors <adriaan.moors@typesafe.com>2015-07-13 10:42:58 -0700
commit216e09b3ead43039f2e34a135820ef098c3be74e (patch)
treec312a233cf3e2cf0c7ddcd679d1437a32dc819ae /test/files/neg/t836.scala
parent9df8f8ae9e36cf1c04929b7b0d2bdfb6fd2f360f (diff)
parent18e3e61778918e4e802b8fb75789635409523372 (diff)
downloadscala-216e09b3ead43039f2e34a135820ef098c3be74e.tar.gz
scala-216e09b3ead43039f2e34a135820ef098c3be74e.tar.bz2
scala-216e09b3ead43039f2e34a135820ef098c3be74e.zip
Merge pull request #4622 from retronym/merge/2.11.x-to-2.12.x-20150713
Merge 2.11.x to 2.12.x [ci: last-only]
Diffstat (limited to 'test/files/neg/t836.scala')
-rw-r--r--test/files/neg/t836.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/files/neg/t836.scala b/test/files/neg/t836.scala
index 3633b816c6..4b86d04013 100644
--- a/test/files/neg/t836.scala
+++ b/test/files/neg/t836.scala
@@ -12,5 +12,5 @@ abstract class A {
class B extends A {
type MyObj = ObjImpl
val myString: S = "hello"
- val realString: String = myString // error: type missmatch
+ val realString: String = myString // error: type mismatch
}