Permalink
Browse files

Merge remote-tracking branch 'alandipert/master'

Conflicts:
	src/faker.clj
  • Loading branch information...
2 parents d8de048 + 319cf7c commit b5a623d0f88295236c1cb510cb439dc1a9c0a9bb @rkneufeld committed Jul 1, 2012
Showing with 2 additions and 1 deletion.
  1. +2 −1 src/faker.clj
View
3 src/faker.clj
@@ -1,4 +1,5 @@
-(ns faker)
+(ns faker
+ (:refer-clojure :exclude (name)))
(def ^:private data (read-string (slurp (.getFile (clojure.java.io/resource "data.clj")))))
(defn first-name [] (rand-nth ((data :names) :first)))

0 comments on commit b5a623d

Please sign in to comment.