Permalink
Browse files

Update leiningen-core/src/leiningen/core/project.clj

use concat instead of merge to merge values, :plugin-repositories and :repositories are lists again 

with merge you will end up with a value for :repositories like [[repo {:url url}] ([pluginrepo {:url url}])]
instead of [[repo {:url url}] [pluginrepo {:url url}]]
  • Loading branch information...
1 parent bfc52ed commit e9386b7362a41abf1ef24c657e4653e0c3308986 @deduktion deduktion committed Sep 4, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 leiningen-core/src/leiningen/core/project.clj
@@ -260,7 +260,7 @@
(if-let [pr (:plugin-repositories project)]
(if (:omit-default-repositories project)
(assoc project :repositories pr)
- (update-in project [:repositories] merge pr))
+ (update-in project [:repositories] concat pr))
project))
(defn load-plugins

0 comments on commit e9386b7

Please sign in to comment.