summaryrefslogtreecommitdiff
path: root/test/files/neg/t0764.check
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2012-03-14 12:27:53 -0700
committerPaul Phillips <paulp@improving.org>2012-03-14 12:27:53 -0700
commita127aae2a5fbae146ea81e470541209436222970 (patch)
tree75b8a7d3362896fd6562eac321b239326296b48a /test/files/neg/t0764.check
parent0c9ffe55c774de261d32f36cc29b954638e86574 (diff)
parent5b562d4e7e451156236b48b3591db980a5691f8d (diff)
downloadscala-a127aae2a5fbae146ea81e470541209436222970.tar.gz
scala-a127aae2a5fbae146ea81e470541209436222970.tar.bz2
scala-a127aae2a5fbae146ea81e470541209436222970.zip
Merge branch 'merge-inline' of /scratch/trunk3 into develop
Diffstat (limited to 'test/files/neg/t0764.check')
-rw-r--r--test/files/neg/t0764.check2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/files/neg/t0764.check b/test/files/neg/t0764.check
index 0788db7f6e..e14c7705b8 100644
--- a/test/files/neg/t0764.check
+++ b/test/files/neg/t0764.check
@@ -1,5 +1,5 @@
t0764.scala:13: error: type mismatch;
- found : Object with Node{type T = _1.type} where val _1: Node{type T = NextType}
+ found : Node{type T = _1.type} where val _1: Node{type T = NextType}
required: Node{type T = Main.this.AType}
new Main[AType]( (value: AType).prepend )
^