Skip to content
Browse files

Fix merge conflict issue.

  • Loading branch information...
1 parent 85dc9ed commit 4293dd28f49e4603a07597010fe7d823b06266ec Mike Simpson committed Aug 5, 2012
Showing with 1 addition and 5 deletions.
  1. +1 −5 src/shared_resource/datomic.clj
View
6 src/shared_resource/datomic.clj
@@ -102,9 +102,6 @@
(let [conn (d/connect (uri datomic-config))]
(q '[:find ?n ?a ?b :where [?n :resource/name ?a] [?n :resource/description ?b]] (db conn))))
-(defn find-user [username]
- (let [conn (d/connect (uri datomic-config))]
- (first (first (q `[:find ?c :where [?c user/username ~username]] (db conn))))))
(defn find-resource [id]
(let [conn (d/connect (uri datomic-config))
@@ -113,6 +110,5 @@
:name (:resource/name entity)
:description (:resource/description entity)
}
- )
-)
+ ))

0 comments on commit 4293dd2

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