From 86a8b18ca525151e528e6d88e50ef1ac332097da Mon Sep 17 00:00:00 2001 From: Divij Sharma Date: Thu, 12 Sep 2024 22:18:28 +0530 Subject: [PATCH] fix(config): Fix merge conflict errors Signed-off-by: Divij Sharma --- config/urls.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/urls.py b/config/urls.py index 4955415..83f5b09 100644 --- a/config/urls.py +++ b/config/urls.py @@ -30,6 +30,6 @@ path(f"{API_BASE_PATH}auth/", include("core.urls")), path(f"{API_BASE_PATH}live/", include("live.urls")), path(f"{API_BASE_PATH}data/", include("data.urls")), - path("admin/", admin.site.urls) path('swagger/', schema_view.with_ui('swagger', cache_timeout=0), name='schema-swagger-ui'), + path("admin/", admin.site.urls) ]