Fix incorrect merge conflict of app import in settings

Themitchell · Themitchell · commit 7a37b564ffa3 · 2025-09-09T15:59:34.000+01:00
diff --git a/lung_cancer_screening/settings.py b/lung_cancer_screening/settings.py
@@ -47,7 +47,7 @@ def boolean_env(key, default=None):
     'django.contrib.messages',
     'django.contrib.staticfiles',
     'lung_cancer_screening.core',
-    'lung_cancer_screening.questions'
+    'lung_cancer_screening.questions',
     'lung_cancer_screening.calculators',
 ]
 

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ def boolean_env(key, default=None):`
`47`	`47`	`'django.contrib.messages',`
`48`	`48`	`'django.contrib.staticfiles',`
`49`	`49`	`'lung_cancer_screening.core',`
`50`		`- 'lung_cancer_screening.questions'`
	`50`	`+ 'lung_cancer_screening.questions',`
`51`	`51`	`'lung_cancer_screening.calculators',`
`52`	`52`	`]`
`53`	`53`