From e749eec5ffd464992020b6a47cc91ddb92f65013 Mon Sep 17 00:00:00 2001 From: Alexander PapaTutuWawa Date: Fri, 5 Feb 2021 13:30:08 +0100 Subject: [PATCH] Remove more merge mistakes --- etebase_server/settings.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/etebase_server/settings.py b/etebase_server/settings.py index 0a4d1e2..d98ecc6 100644 --- a/etebase_server/settings.py +++ b/etebase_server/settings.py @@ -130,10 +130,6 @@ STATIC_ROOT = os.environ.get("DJANGO_STATIC_ROOT", os.path.join(BASE_DIR, "stati MEDIA_ROOT = os.environ.get("DJANGO_MEDIA_ROOT", os.path.join(BASE_DIR, "media")) MEDIA_URL = "/user-media/" -ETEBASE_API_AUTHENTICATORS = ( - "django_etebase.token_auth.authentication.TokenAuthentication", - "rest_framework.authentication.SessionAuthentication", -) # Define where to find configuration files config_locations = [