From 1cde31c86d9423e9b7a7409c2ef2ba7c0500e47f Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Sat, 25 Feb 2012 18:45:17 +0000
Subject: Massive merge

---
 examples/urls.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'examples/urls.py')

diff --git a/examples/urls.py b/examples/urls.py
index f246828a..fda7942f 100644
--- a/examples/urls.py
+++ b/examples/urls.py
@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import patterns, include
+from django.conf.urls.defaults import patterns, include, url
 from sandbox.views import Sandbox
 try:
     from django.contrib.staticfiles.urls import staticfiles_urlpatterns
@@ -15,9 +15,7 @@ urlpatterns = patterns('',
     (r'^pygments/', include('pygments_api.urls')),
     (r'^blog-post/', include('blogpost.urls')),
     (r'^permissions-example/', include('permissionsexample.urls')),
-    (r'^request-example/', include('requestexample.urls')),
-
-    (r'^', include('djangorestframework.urls')),
+    url(r'^restframework/', include('djangorestframework.urls', namespace='djangorestframework')),
 )
 
 urlpatterns += staticfiles_urlpatterns()
-- 
cgit v1.2.3