diff options
author | aleksandar <aleksandar@lampmac14.epfl.ch> | 2012-01-30 14:01:12 +0100 |
---|---|---|
committer | aleksandar <aleksandar@lampmac14.epfl.ch> | 2012-01-30 14:01:12 +0100 |
commit | 5f4c97c448f161b3bab7ae3271e30620eb9bea76 (patch) | |
tree | 337ba5231b800c680869931af1184b3ed77a692b /test/files/neg/t2870.check | |
parent | a70d338afaef9a42bf13334267d07a43ad10c5c0 (diff) | |
parent | 5e9dd4a05c25f463f29d0fbc2f1bec194bf7700b (diff) | |
download | scala-5f4c97c448f161b3bab7ae3271e30620eb9bea76.tar.gz scala-5f4c97c448f161b3bab7ae3271e30620eb9bea76.tar.bz2 scala-5f4c97c448f161b3bab7ae3271e30620eb9bea76.zip |
Merge branch 'master' into issue/5374
Diffstat (limited to 'test/files/neg/t2870.check')
-rw-r--r-- | test/files/neg/t2870.check | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/files/neg/t2870.check b/test/files/neg/t2870.check index ab962d48c8..99522eca65 100644 --- a/test/files/neg/t2870.check +++ b/test/files/neg/t2870.check @@ -1,4 +1,4 @@ -t2870.scala:1: error: not found: type Jar (similar: Jars) +t2870.scala:1: error: not found: type Jar class Jars(jar: Jar) ^ t2870.scala:4: error: encountered unrecoverable cycle resolving import. |