diff options
| author | Seth Tisue <seth@tisue.net> | 2015-09-08 13:23:22 -0400 |
|---|---|---|
| committer | Seth Tisue <seth@tisue.net> | 2015-09-08 13:23:22 -0400 |
| commit | ad17b552b8f7c3a435ad8de71cd7268f905a1b8d (patch) | |
| tree | fc4093f85c79cb9dc6bfb77a62128652f32a68ec /test/files/neg/name-lookup-stable.check | |
| parent | 468abc47999a39801f9e8672900fea797dea6611 (diff) | |
| download | scala-ad17b552b8f7c3a435ad8de71cd7268f905a1b8d.tar.gz scala-ad17b552b8f7c3a435ad8de71cd7268f905a1b8d.tar.bz2 scala-ad17b552b8f7c3a435ad8de71cd7268f905a1b8d.zip | |
Merge remote-tracking branch 'origin/2.11.x' into 2.12.x
only trivial merge conflicts here.
not dealing with PR #4333 in this merge because there is a substantial
conflict there -- so that's why I stopped at
63daba33ae99471175e9d7b20792324615f5999b for now
Diffstat (limited to 'test/files/neg/name-lookup-stable.check')
| -rw-r--r-- | test/files/neg/name-lookup-stable.check | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/files/neg/name-lookup-stable.check b/test/files/neg/name-lookup-stable.check index 751df9505e..68d98c4162 100644 --- a/test/files/neg/name-lookup-stable.check +++ b/test/files/neg/name-lookup-stable.check @@ -6,6 +6,6 @@ import ColumnOption._ name-lookup-stable.scala:17: error: reference to PrimaryKey is ambiguous; it is both defined in class A and imported subsequently by import ColumnOption._ - PrimaryKey // was already ambigious in 2.10.3 + PrimaryKey // was already ambiguous in 2.10.3 ^ two errors found |