Fixup rebase issues

Author: chosak

friendly_umbrella/settings.py

@@ -30,7 +30,9 @@
 # See https://docs.djangoproject.com/en/4.2/howto/deployment/checklist/
 
 # SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = "django-insecure-xe9&^1#%wg%d-qjy861j5j*_yvf^m@_r-+jcqe0qt9($r4=4!k"
+SECRET_KEY = (
+    "django-insecure-xe9&^1#%wg%d-qjy861j5j*_yvf^m@_r-+jcqe0qt9($r4=4!k"
+)
 
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
@@ -39,8 +41,6 @@
 
 CSRF_TRUSTED_ORIGINS = ["https://*.cfpb.gov"]
 
-CSRF_TRUSTED_ORIGINS = ["https://*.cfpb.gov"]
-
 # Application definition
 
 INSTALLED_APPS = [
@@ -85,8 +85,6 @@
     },
 ]
 
-# Optionally patch the environment with file-based variables.
-patch_environ(os.getenv("PATCH_ENVIRON_PATH"))
 WSGI_APPLICATION = "friendly_umbrella.wsgi.application"