Fix merge errors

codeforboston · Mar 26, 2024 · b2940c0 · b2940c0
1 parent 57880c7
commit b2940c0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/backend/schemas.py b/backend/schemas.py
@@ -13,7 +13,7 @@
 from .database.models.action import Action
 from .database.models.partner import Partner, PartnerMember, MemberRole
 from .database.models.incident import Incident, SourceDetails
-from .database.models.agency import Agency, Jurisdiction, Jurisdiction
+from .database.models.agency import Agency, Jurisdiction
 from .database.models.officer import Officer, StateID
 from .database.models.employment import Employment
 from .database.models.accusation import Accusation

diff --git a/backend/tests/test_employment.py b/backend/tests/test_employment.py
@@ -89,6 +89,7 @@ def example_agencies(db_session):
     db_session.commit()
     return agencies
 
+
 @pytest.fixture
 def example_officers(db_session):
     officers = {}