summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2014-12-05 11:33:09 -0800
committerAdriaan Moors <adriaan.moors@typesafe.com>2014-12-05 11:33:09 -0800
commit1e223a5d413e7b3ff1a96e33438b4491b91cd09c (patch)
tree344f5483ad169fea97cd86c8bb2b629dc3e804e7 /src
parent124cf2f62f559caf37a5d5df7e15db7ba5958bcf (diff)
parent0147c734ec97a05131d1908232e70517b7c20ab7 (diff)
downloadscala-1e223a5d413e7b3ff1a96e33438b4491b91cd09c.tar.gz
scala-1e223a5d413e7b3ff1a96e33438b4491b91cd09c.tar.bz2
scala-1e223a5d413e7b3ff1a96e33438b4491b91cd09c.zip
Merge pull request #4187 from jedesah/patch-1
Fix typo
Diffstat (limited to 'src')
-rw-r--r--src/compiler/scala/tools/nsc/typechecker/Namers.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Namers.scala b/src/compiler/scala/tools/nsc/typechecker/Namers.scala
index a1de5e303b..0bb94be636 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Namers.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Namers.scala
@@ -584,7 +584,7 @@ trait Namers extends MethodSynthesis {
// more than one hidden name, the second will not be warned.
// So it is the position of the actual hidden name.
//
- // Note: java imports have precence over definitions in the same package
+ // Note: java imports have precedence over definitions in the same package
// so don't warn for them. There is a corresponding special treatment
// in the shadowing rules in typedIdent to (SI-7232). In any case,
// we shouldn't be emitting warnings for .java source files.