diff options
| author | tom christie tom@tomchristie.com | 2011-01-26 21:09:08 +0000 |
|---|---|---|
| committer | tom christie tom@tomchristie.com | 2011-01-26 21:09:08 +0000 |
| commit | d38f7f3ef7ab803a8b9babda8f6be989f378429e (patch) | |
| tree | b84f5c23d7097f0b7c298a060b8f5d00d847e7eb | |
| parent | 9adb965126366bfe4b364357f565baabd819c982 (diff) | |
| download | django-rest-framework-d38f7f3ef7ab803a8b9babda8f6be989f378429e.tar.bz2 | |
Fix broken merge
| -rw-r--r-- | examples/urls.py | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/examples/urls.py b/examples/urls.py index 62001016..ef55e2b5 100644 --- a/examples/urls.py +++ b/examples/urls.py @@ -4,15 +4,9 @@ from django.contrib import admin admin.autodiscover() urlpatterns = patterns('', -<<<<<<< local - (r'^blog-post-api/', include('blogpost.urls')), - (r'^object-store-api/', include('objectstore.urls')), - (r'^pygments-api/', include('pygments_api.urls')), -======= - (r'pygments-example/', include('pygmentsapi.urls')), + (r'pygments-example/', include('pygments_api.urls')), (r'^blog-post-example/', include('blogpost.urls')), (r'^object-store-example/', include('objectstore.urls')), ->>>>>>> other (r'^admin/doc/', include('django.contrib.admindocs.urls')), (r'^admin/', include(admin.site.urls)), ) |