# HG changeset patch
# User Madhusudan.C.S <madhusudancs@gmail.com>
# Date 1254497089 14400
# Node ID afd26635023157d71107fbf54a81b7db73d37543
# Parent  72ce0ed9133a7908150b424691bebe3262ed42cb
Merged urls.py.

diff -r 72ce0ed9133a -r afd266350231 urls.py
--- a/urls.py	Fri Oct 02 11:24:21 2009 -0400
+++ b/urls.py	Fri Oct 02 11:24:49 2009 -0400
@@ -18,7 +18,7 @@
 
     # Uncomment the next line to enable the admin:
     # (r'^admin/', include(admin.site.urls)),
-    url (r'^$', 'conference.views.home'),
+    (r'^$', 'conference.views.home'),
     (r'^accounts/', include('registration.urls')),
     (r'^register/','conference.views.register'),
     (r'^logout/','conference.views.logout_view'),