From 5ac6cfbcf383ef649335e9bfe1f315943ec28c82 Mon Sep 17 00:00:00 2001 From: jem Date: Mon, 17 Feb 2020 20:33:52 +0100 Subject: [PATCH] fix merge order --- src/cryogen_core/classpath_able_io.clj | 2 +- src/cryogen_core/compiler.clj | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/cryogen_core/classpath_able_io.clj b/src/cryogen_core/classpath_able_io.clj index 8431284..a8d6598 100644 --- a/src/cryogen_core/classpath_able_io.clj +++ b/src/cryogen_core/classpath_able_io.clj @@ -83,7 +83,7 @@ cp-resource-map (if from-cp (apply merge (map virtual-path-map (cp/get-resources base-path paths))) {}) - resulting-map (merge fs-resource-map cp-resource-map)] + resulting-map (merge cp-resource-map fs-resource-map)] (if (empty? resulting-map) [] (vals resulting-map)))) diff --git a/src/cryogen_core/compiler.clj b/src/cryogen_core/compiler.clj index 27a3179..0740a2a 100644 --- a/src/cryogen_core/compiler.clj +++ b/src/cryogen_core/compiler.clj @@ -521,7 +521,8 @@ klipsified-pages (map klipsify (read-pages config)) modelled-pages (cond (= page-model :flat) klipsified-pages - (= page-model :hierarchic) (hierarchic/build-hierarchic-map page-root-uri klipsified-pages)) + (= page-model :hierarchic) + (hierarchic/build-hierarchic-map page-root-uri klipsified-pages)) home-page (->> modelled-pages (filter #(boolean (:home? %))) (first))