From 8ff378d73075ba5fb8388a6d3218129956c661f3 Mon Sep 17 00:00:00 2001 From: Artem Homenko Date: Mon, 6 Feb 2017 15:24:08 +0200 Subject: [PATCH] Resolve merge conflict --- rest_framework/routers.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rest_framework/routers.py b/rest_framework/routers.py index 5f5132fb2..919fbe7d5 100644 --- a/rest_framework/routers.py +++ b/rest_framework/routers.py @@ -257,9 +257,9 @@ class SimpleRouter(BaseRouter): ) # 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, - # so a slash in the beginning will (A) cause Django to give - # warnings and (B) generate URLS that will require using '//'. + # 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 + # warnings and (B) generate URLS that will require using '//'. if not prefix and regex[:2] == '^/': regex = '^' + regex[2:]