encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-08-05 04:50:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Resolve merge conflict

Browse Source
This commit is contained in:
Artem Homenko 2017-02-06 15:24:08 +02:00
parent e59e2c4cca
commit 8ff378d730
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rest_framework/routers.py
View File

@ -257,9 +257,9 @@ class SimpleRouter(BaseRouter):
) )
# If there is no prefix, the first part of the url is probably # If there is no prefix, the first part of the url is probably
# controlled by project's urls.py and the router is in an app, # controlled by project's urls.py and the router is in an app,
# so a slash in the beginning will (A) cause Django to give # so a slash in the beginning will (A) cause Django to give
# warnings and (B) generate URLS that will require using '//'. # warnings and (B) generate URLS that will require using '//'.
if not prefix and regex[:2] == '^/': if not prefix and regex[:2] == '^/':
regex = '^' + regex[2:] regex = '^' + regex[2:]