Permalink
Browse files

Merge branch 'release/2.0.0-alpha4'

  • Loading branch information...
2 parents 39c90c2 + 6c90d3b commit f01f1812a493991bd6cab50d5d874992ff64a73a @amalloy amalloy committed Aug 20, 2012
Showing with 1 addition and 5 deletions.
  1. +1 −1 project.clj
  2. +0 −4 src/foreclojure/problems.clj
View
@@ -1,4 +1,4 @@
-(defproject foreclojure "2.0.0-alpha3"
+(defproject foreclojure "2.0.0-alpha4"
:description "4clojure - a website for learning Clojure"
:dependencies [[org.clojure/clojure "1.4.0"]
[compojure "1.1.0"]
@@ -14,11 +14,7 @@
[foreclojure.users :only [golfer? get-user-id disable-codebox?]]
[foreclojure.solutions :only [save-solution get-solution]]
[clojail.core :exclude [safe-read]]
-<<<<<<< HEAD
- [clojail.testers :only [secure-tester blanket blacklist-symbols]]
-=======
[clojail.testers :only [secure-tester]]
->>>>>>> 8a9f2
[somnium.congomongo :only [update! fetch-one fetch fetch-and-modify destroy!]]
[hiccup.form :only [form-to text-area hidden-field label text-field drop-down]]
[hiccup.element :only [link-to]]

0 comments on commit f01f181

Please sign in to comment.