no message

bcgov · Jan 22, 2024 · ad4e24a · ad4e24a
1 parent 051c824
commit ad4e24a
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/legal-api/src/legal_api/core/meta/filing.py b/legal-api/src/legal_api/core/meta/filing.py
@@ -72,7 +72,6 @@ class FilingTitles(str, Enum):
 
 
 FILINGS: Final = {
-<<<<<<< HEAD
     "adminFreeze": {"name": "adminFreeze", "title": "Admin Freeze", "displayName": "Admin Freeze", "code": "NOFEE"},
     "affidavit": {"name": "affidavit", "title": "Affidavit", "codes": {"CP": "AFDVT"}},
     "agmExtension": {