Resolved src/site.clj conflict

1 files changed, 6 insertions, 16 deletions

diff --git a/src/site.clj b/src/site.clj
index 4db69e8..2ea60a6 100755
--- a/src/site.clj
+++ b/src/site.clj
@@ -95,7 +95,7 @@
 
 ;; User authentication
 
-(def nick-regex #"^[A-Za-z0-9\-_∆˚†]*$")
+(def nick-regex #"^[A-Za-z0-9\-_∆˚†]*$")
 
 (defn is-invalid-nick? [n]
   (cond
@@ -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
+