Skip to content

D
django-rest-framework
Commit d38f7f3e by tom christie tom@tomchristie.com
Options

Fix broken merge

parent 9adb9651
Showing with 1 additions and 7 deletions
examples/urls.py
...@@ -4,15 +4,9 @@ from django.contrib import admin ...@@ -4,15 +4,9 @@ from django.contrib import admin
admin.autodiscover() admin.autodiscover()
urlpatterns = patterns('', urlpatterns = patterns('',
<<<<<<< local (r'pygments-example/', include('pygments_api.urls')),
(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'^blog-post-example/', include('blogpost.urls')), (r'^blog-post-example/', include('blogpost.urls')),
(r'^object-store-example/', include('objectstore.urls')), (r'^object-store-example/', include('objectstore.urls')),
>>>>>>> other
(r'^admin/doc/', include('django.contrib.admindocs.urls')), (r'^admin/doc/', include('django.contrib.admindocs.urls')),
(r'^admin/', include(admin.site.urls)), (r'^admin/', include(admin.site.urls)),
) )
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment