Resolve conflict

cisagov · Oct 2, 2024 · bebac74 · bebac74
1 parent 09cac1d
commit bebac74
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/backend/src/xfd_django/xfd_api/views.py b/backend/src/xfd_django/xfd_api/views.py
@@ -36,7 +36,7 @@
 from .models import Assessment, User
 from .schema_models import scan as scanSchema
 from .schema_models import scan_tasks as scanTaskSchema
-from .schema_models.assessment import Assessment
+from .schema_models.assessment import Assessment as AssessmentSchema
 from .schema_models.cpe import Cpe as CpeSchema
 from .schema_models.cve import Cve as CveSchema
 from .schema_models.domain import Domain as DomainSchema