summaryrefslogtreecommitdiff
path: root/test/files/pos/t1263
diff options
context:
space:
mode:
authorAntonio Cunei <antonio.cunei@epfl.ch>2010-09-01 09:43:36 +0000
committerAntonio Cunei <antonio.cunei@epfl.ch>2010-09-01 09:43:36 +0000
commit58882f89e76fd1cf824dfd9c537cadf153064860 (patch)
treef61511b071df41d79413a7d2d468ccf945a35524 /test/files/pos/t1263
parentcc57d03af8a97c4b9a6162acbc3a727384bb8a86 (diff)
downloadscala-58882f89e76fd1cf824dfd9c537cadf153064860.tar.gz
scala-58882f89e76fd1cf824dfd9c537cadf153064860.tar.bz2
scala-58882f89e76fd1cf824dfd9c537cadf153064860.zip
Undid all commits between 22566 and 22597 included
in the 2.8.x branch, restoring the status to 2.8.0 final release, in preparation for 2.8.1.
Diffstat (limited to 'test/files/pos/t1263')
-rw-r--r--test/files/pos/t1263/Test.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/files/pos/t1263/Test.java b/test/files/pos/t1263/Test.java
index 6ca88c21a1..0eb43e881a 100644
--- a/test/files/pos/t1263/Test.java
+++ b/test/files/pos/t1263/Test.java
@@ -5,7 +5,7 @@ import java.rmi.RemoteException;
import test.Map;
public class Test implements Map<String, String> {
- public Map.MapTo plus(String o) {
+ public Map<String, String>.MapTo plus(String o) {
return null;
}