diff options
| author | Ivan Topolnjak <ivantopo@gmail.com> | 2015-03-12 01:09:44 +0100 |
|---|---|---|
| committer | Ivan Topolnjak <ivantopo@gmail.com> | 2015-03-12 01:09:44 +0100 |
| commit | 33f063eeb11d3381a2a66e5421ab046cdd0b57e5 (patch) | |
| tree | f2bb7af8c1b26c57033b17f7ff988d5a73a9aa91 /kamon-core/src/main/scala/kamon/util | |
| parent | ce47f95b1e94a2f8ec51a5c58061e54005cccbde (diff) | |
| download | Kamon-33f063eeb11d3381a2a66e5421ab046cdd0b57e5.tar.gz Kamon-33f063eeb11d3381a2a66e5421ab046cdd0b57e5.tar.bz2 Kamon-33f063eeb11d3381a2a66e5421ab046cdd0b57e5.zip | |
= core: put the ModuleLoader back in place for auto-starting modules.
Diffstat (limited to 'kamon-core/src/main/scala/kamon/util')
| -rw-r--r-- | kamon-core/src/main/scala/kamon/util/MapMerge.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kamon-core/src/main/scala/kamon/util/MapMerge.scala b/kamon-core/src/main/scala/kamon/util/MapMerge.scala index 64b4f7ae..8573358b 100644 --- a/kamon-core/src/main/scala/kamon/util/MapMerge.scala +++ b/kamon-core/src/main/scala/kamon/util/MapMerge.scala @@ -19,7 +19,7 @@ package kamon.util object MapMerge { /** - * Merge to immutable maps with the same key and value types, using the provided valueMerge function. + * Merge two immutable maps with the same key and value types, using the provided valueMerge function. */ implicit class Syntax[K, V](val map: Map[K, V]) extends AnyVal { def merge(that: Map[K, V], valueMerge: (V, V) ⇒ V): Map[K, V] = { |