Don't warn of profile merge conflicts when the classes match.

juergenhoetzel · Apr 7, 2012 · 49dcb03 · 49dcb03
1 parent 5206f93
commit 49dcb03
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/leiningen-core/src/leiningen/core/project.clj b/leiningen-core/src/leiningen/core/project.clj
@@ -144,6 +144,8 @@
         (and (coll? result) (coll? latter))
         (concat latter result)
 
+        (= (class result) (class latter)) latter
+
         :else (doto latter (println "has a type mismatch merging profiles."))))
 
 (defn merge-profile [project profile]