Browse files

Merge branch 'develop' of github.com:SciMed/shared-resource into develop

Fixed depedencies and code conflicts. Got rid of noir-cljs in favor of
lein-cljsbuild.

Conflicts:
	src/shared_resource/views/resource.clj
  • Loading branch information...
1 parent 03ddc31 commit 13e690692c2debdde1e03d0a6542e1f561fe997e David Davis committed Aug 11, 2012
Showing with 3 additions and 1 deletion.
  1. +2 −1 project.clj
  2. +1 −0 src/shared_resource/views/example.cljs
View
3 project.clj
@@ -2,8 +2,9 @@
:description "FIXME: write this!"
:dependencies [[org.clojure/clojure "1.4.0"]
[noir "1.3.0-beta10"]
+ [lein-cljsbuild "0.2.5"]
[com.datomic/datomic-free "0.8.3397"]
[org.clojars.pntblnk/clj-ldap "0.0.9"]]
:plugins [[lein-swank "1.4.4"]]
- :main shared-resource.server)
+ :main ^{:skip-aot true} shared-resource.server)
View
1 src/shared_resource/views/example.cljs
@@ -0,0 +1 @@
+(js/alert "hello")

0 comments on commit 13e6906

Please sign in to comment.