fix syntax error

C-Loftus · C-Loftus · commit eac1418a72bf · 2025-03-06T12:27:32.000-05:00
diff --git a/rise/edr_helpers.py b/rise/edr_helpers.py
@@ -61,15 +61,7 @@ def get_catalogItemURLs(
                     catalogRecordToCatalogItems[catalogRecord] = []
                 catalogRecordToCatalogItems[catalogRecord].append(catalogItem)
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-=======
->>>>>>> 2dabbd7c6918953ac7d24c8250b1c3582505bead
         join: dict[str, list[str]] = {}
-=======
-        join = {}
->>>>>>> ced138fcf547b7463e3aaf7dd970fec6be8ce6e9
         for locationId, catalogRecord in locationIdToCatalogRecord.items():
             if catalogRecord in catalogRecordToCatalogItems:
                 for catalogItem in catalogRecordToCatalogItems[catalogRecord]:
