From c9a0e36224b6eb2807bad0df2d5aa11bb05c8a32 Mon Sep 17 00:00:00 2001
From: Eugene Burmako <xeno.by@gmail.com>
Date: Tue, 5 Feb 2013 11:53:43 +0100
Subject: [nomaster] Revert "refactors handling of parent types"

This reverts commit 40063b0009d55ed527bf1625d99a168a8faa4124.

Conflicts:
	src/compiler/scala/tools/nsc/ast/parser/Parsers.scala
	src/compiler/scala/tools/nsc/typechecker/Typers.scala
---
 test/files/neg/t2148.check | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'test/files/neg/t2148.check')

diff --git a/test/files/neg/t2148.check b/test/files/neg/t2148.check
index 27b5dce507..5113b48e51 100644
--- a/test/files/neg/t2148.check
+++ b/test/files/neg/t2148.check
@@ -1,4 +1,4 @@
-t2148.scala:9: error: A is not a legal prefix for a constructor
+t2148.scala:9: error: type A is not a stable prefix
   val b = new A with A#A1
                        ^
 one error found
-- 
cgit v1.2.3