Skip to content

Commit

Permalink
Removing potential ns conflict
Browse files Browse the repository at this point in the history
Because immutant/core has an immutant.util ns, this one can hide it when
it's among the dependencies of an app deployed by fntest.
  • Loading branch information
jcrossley3 committed Mar 16, 2015
1 parent 604e4f7 commit ea0e168
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/immutant/util.clj → src/immutant/lein/util.clj
@@ -1,4 +1,4 @@
(ns immutant.util
(ns immutant.lein.util
(:require [leiningen.core.main :as lcm]
[leiningen.core.project :as project]
[clojure.tools.cli :as opts]
Expand Down
2 changes: 1 addition & 1 deletion src/immutant/test.clj
Expand Up @@ -3,7 +3,7 @@
(:require [leiningen.core.main :refer [abort]]
[fntest.core :as fntest]
[clojure.java.io :as io]
[immutant.util :as u]
[immutant.lein.util :as u]
[immutant.war :refer [war]]))

(def option-specs
Expand Down
2 changes: 1 addition & 1 deletion src/immutant/war.clj
Expand Up @@ -6,7 +6,7 @@
[leiningen.uberjar :as uberjar]
[clojure.string :as str]
[clojure.java.io :as io]
[immutant.util :as u]
[immutant.lein.util :as u]
[immutant.deploy-tools.war :as dt-war]))

(defn resolve-path [project path]
Expand Down

0 comments on commit ea0e168

Please sign in to comment.