Resolve conlict

sikweb/settings.py

@@ -15,6 +15,7 @@ import sentry_sdk
 from sentry_sdk.integrations.django import DjangoIntegration
 from sikweb.base import *
 from datetime import timedelta
+import json
 
 load_dotenv()  # loads the configs from .env
 
@@ -79,6 +80,9 @@ DATABASES = {
     }
 }
 
+# Google api settings
+GROUP_KEY = os.getenv("GROUP_KEY", "")
+GOOGLE_SERVICE_ACCOUNT = json.loads(os.getenv("GOOGLE_CREDS_JSON", "{}"))
 
 # JWT authentication
 SIMPLE_JWT = {