Fix merge conflict issue.

daviddavis · Aug 5, 2012 · 4293dd2 · 4293dd2
1 parent 85dc9ed
commit 4293dd2
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/src/shared_resource/datomic.clj b/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)
    }
-  )
+  ))
-)