Skip to content
Browse files

Cleanup merge commit

  • Loading branch information...
1 parent 9614c2c commit 544b05f0d5dc43dd3a68047c788548d95bff48cd @amalloy amalloy committed Aug 19, 2012
Showing with 0 additions and 4 deletions.
  1. +0 −4 src/foreclojure/problems.clj
View
4 src/foreclojure/problems.clj
@@ -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 544b05f

Please sign in to comment.
Something went wrong with that request. Please try again.