simon/smeagol
1
0
Fork 0
mirror of https://github.com/journeyman-cc/smeagol.git synced 2026-04-12 18:05:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Nasty! Merge seems to have messed up?

Browse source
This commit is contained in:
simon 2017-08-08 23:59:49 +01:00
parent e54e7fac66
commit 94b3605afd
1 changed files with 0 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
project.clj
View file

@ -25,11 +25,7 @@
[org.slf4j/jcl-over-slf4j "1.7.25"] [org.slf4j/jcl-over-slf4j "1.7.25"]
[com.taoensso/tower "3.0.2" :exclusions [com.taoensso/encore]] [com.taoensso/tower "3.0.2" :exclusions [com.taoensso/encore]]
<<<<<<< Temporary merge branch 1
[markdown-clj "0.9.99" :exclusions [com.keminglabs/cljx]] [markdown-clj "0.9.99" :exclusions [com.keminglabs/cljx]]
=======
[markdown-clj "0.9.91" :exclusions [com.keminglabs/cljx]]
>>>>>>> Temporary merge branch 2
[crypto-password "0.2.0"] [crypto-password "0.2.0"]
[clj-jgit "0.8.9"] [clj-jgit "0.8.9"]
[environ "1.1.0"] [environ "1.1.0"]