Commits

Sean Grove committed 113dfde

Fixed conflicts, learned a bit about mercurial

  • Participants
  • Parent commits 3b7cb7f

Comments (0)

Files changed (1)

File src/vodo.clj

     "Need to " [:a {:href "/register"} "Register"] "?"))
 
 (defn twilio [params]
+<<<<<<< local
+  "Handle twilio SMS event"
+  (println params)
+=======
   "Handle Twilio SMS event"
+>>>>>>> other
   (let [phone (params "From")
         text (params "Body")
         user (phone->user phone)]
           (redirect (list-url user))))
   (GET "/memos/:user/list" [user] (memos-page user))
   (POST "/twilio/sms" {params :params} (twilio params))
+<<<<<<< local
+=======
   (route/files "/static" {:root "static"})
+>>>>>>> other
   (route/not-found "Page not found"))
 
 (defn main []