From 628060d94e919f4480cdb6f1abdcd49fd81f62dc Mon Sep 17 00:00:00 2001
From: Alexandre Archambault <alexandre.archambault@gmail.com>
Date: Wed, 17 Jun 2015 19:27:17 +0200
Subject: [PATCH] Typo in doc

---
 core/src/main/scala/coursier/core/Resolver.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/scala/coursier/core/Resolver.scala b/core/src/main/scala/coursier/core/Resolver.scala
index 3ef6ebb3d..428e3d6c1 100644
--- a/core/src/main/scala/coursier/core/Resolver.scala
+++ b/core/src/main/scala/coursier/core/Resolver.scala
@@ -148,7 +148,7 @@ object Resolver {
 
   /**
    * Merge several dependencies, solving version constraints of duplicated modules.
-   * Returns the conflicted dependencies, and the (solved) others.
+   * Returns the conflicted dependencies, and the (merged) others.
    */
   def merge(dependencies: TraversableOnce[Dependency]): (Seq[Dependency], Seq[Dependency]) = {
     val m = dependencies