diff options
| author | Ivan Topolnjak <ivantopo@gmail.com> | 2014-12-29 10:23:09 +0100 |
|---|---|---|
| committer | Ivan Topolnjak <ivantopo@gmail.com> | 2014-12-29 10:23:09 +0100 |
| commit | 61089a75240f5cc21b056087f1d633dd31981c61 (patch) | |
| tree | db5963ade258c919b901b0065ebfba863d830606 | |
| parent | 34237a477217c226c90fa10f7448e249ed83b5f2 (diff) | |
| download | Kamon-61089a75240f5cc21b056087f1d633dd31981c61.tar.gz Kamon-61089a75240f5cc21b056087f1d633dd31981c61.tar.bz2 Kamon-61089a75240f5cc21b056087f1d633dd31981c61.zip | |
= core: workaround intellij import name shadowing issue.
More details can be found at: https://youtrack.jetbrains.com/issue/SCL-8074
| -rw-r--r-- | kamon-core/src/main/scala/kamon/Kamon.scala | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/kamon-core/src/main/scala/kamon/Kamon.scala b/kamon-core/src/main/scala/kamon/Kamon.scala index dfebd3a5..00026b77 100644 --- a/kamon-core/src/main/scala/kamon/Kamon.scala +++ b/kamon-core/src/main/scala/kamon/Kamon.scala @@ -14,10 +14,11 @@ */ package kamon -import akka.actor._ +import _root_.akka.actor +import _root_.akka.actor._ object Kamon { - trait Extension extends akka.actor.Extension + trait Extension extends actor.Extension def apply[T <: Extension](key: ExtensionId[T])(implicit system: ActorSystem): T = key(system) } |