From cf48ab4a81339f327a534585c54e01a57f9dfa86 Mon Sep 17 00:00:00 2001 From: dumpfmprod Date: Wed, 24 Feb 2010 08:38:11 -0500 Subject: Resolved site.clj --- src/site.clj | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) (limited to 'src') diff --git a/src/site.clj b/src/site.clj index 4db69e8..167f4d5 100755 --- a/src/site.clj +++ b/src/site.clj @@ -661,29 +661,19 @@ (dosync (doseq [room-db (fetch-rooms)] - (alter rooms assoc (room-db :key) - (build-room-map-from-db room-db)))) -<<<<<<< HEAD - -(run-server {:port 8080} - "/static/*" (servlet static) - "/images/*" (servlet static) - "/avatars/*" (servlet static) - "/upload/*" (servlet multipart) - "/*" (servlet pichat)) - -(send-off flusher flush!) -======= + (alter rooms assoc (room-db :key) + (build-room-map-from-db room-db)))) (defn start-server ([port] (run-server {:port port} "/static/*" (servlet static) "/images/*" (servlet static) - "/upload" (servlet multipart) + "/avatars/*" (servlet static) + "/upload/*" (servlet multipart) "/*" (servlet pichat))) ([] (start-server 8080))) (start-server) (start-user-flusher!) (start-session-pruner!) ->>>>>>> 8003ba27e49a630b24090f3af01426f35e85af67 + -- cgit v1.2.3-70-g09d2