encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-02-26 08:20:46 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix broken merge

Browse Source
This commit is contained in:
tom christie tom@tomchristie.com 2011-01-26 21:09:08 +00:00
parent 9adb965126
commit d38f7f3ef7
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
examples/urls.py
View File

@ -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)),
)