summaryrefslogtreecommitdiff
path: root/test/files/pos/t1050.scala
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/pos/t1050.scala
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/pos/t1050.scala')
-rw-r--r--test/files/pos/t1050.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/files/pos/t1050.scala b/test/files/pos/t1050.scala
index e017e30713..d34b0cff16 100644
--- a/test/files/pos/t1050.scala
+++ b/test/files/pos/t1050.scala
@@ -1,7 +1,7 @@
package t1050
abstract class A {
- type T <: scala.ScalaObject
+ type T <: scala.AnyRef
class A { this: T =>
def b = 3
def c = b