Remove dead :jvm-opts lookup

Coming from the 57ea876 cleanup
danbst · Jan 7, 2014 · a579ccd · a579ccd
1 parent 613a33b
commit a579ccd
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/leiningen-core/src/leiningen/core/project.clj b/leiningen-core/src/leiningen/core/project.clj
@@ -294,8 +294,7 @@
             :repositories repos
             :plugin-repositories repos)
           (-> (meta-merge defaults project)
-              (assoc :jvm-opts (or (:jvm-opts project) (:java-opts project)
-                                   (:jvm-opts defaults)))
+              (assoc :jvm-opts (or (:jvm-opts project) (:java-opts project)))
               (dissoc :eval-in-leiningen :omit-default-repositories :java-opts)
               (assoc :eval-in (or (:eval-in project)
                                   (if (:eval-in-leiningen project)