From 0cb8fceb81e5ab3256e696b83b5431f612593df8 Mon Sep 17 00:00:00 2001
From: simon <simon@journeyman.cc>
Date: Thu, 13 Nov 2014 22:10:17 +0000
Subject: [PATCH] Trying to track down the 'lu' bug; added exclusions for all
 conflicts.

---
 .gitignore  |  1 +
 project.clj | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 42d8f11..2c9d4a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ pom.xml.asc
 .lein-repl-history
 .lein-plugins/
 .lein-failures
+.lein-env
diff --git a/project.clj b/project.clj
index 55ecc33..8eb55e3 100644
--- a/project.clj
+++ b/project.clj
@@ -2,11 +2,11 @@
   :description "A simple Git-backed Wiki inspired by Gollum"
   :url "http://example.com/FIXME"
   :dependencies [[org.clojure/clojure "1.6.0"]
-                 [lib-noir "0.9.4"]
+                 [lib-noir "0.9.4" :exclusions [org.clojure/core.memoize org.clojure/tools.reader]]
                  [ring-server "0.3.1"]
                  [selmer "0.7.2"]
-                 [com.taoensso/timbre "3.3.1"]
-                 [com.taoensso/tower "3.0.2"]
+                 [com.taoensso/timbre "3.3.1" :exclusions [org.clojure/tools.reader]]
+                 [com.taoensso/tower "3.0.2" :exclusions [com.taoensso/encore]]
                  [markdown-clj "0.9.55" :exclusions [com.keminglabs/cljx]]
                  [clj-jgit "0.8.1"]
                  [environ "1.0.0"]
@@ -16,10 +16,10 @@
 
   :repl-options {:init-ns smeagol.repl}
   :jvm-opts ["-server"]
-  :plugins [[lein-ring "0.8.13"]
+  :plugins [[lein-ring "0.8.13" :exclusions [org.clojure/clojure]]
             [lein-environ "1.0.0"]
-            [lein-ancient "0.5.5"]
-            [lein-marginalia "0.7.1"]]
+            [lein-ancient "0.5.5" :exclusions [org.clojure/clojure org.clojure/data.xml]]
+            [lein-marginalia "0.7.1" :exclusions [org.clojure/clojure]]]
   :ring {:handler smeagol.handler/app
          :init    smeagol.handler/init
          :destroy smeagol.handler/destroy}