NRL-1933 fix merge conflict

katebobyn-nhs · katebobyn-nhs · commit 43f54641c7c1 · 2026-03-12T12:51:16.000Z
diff --git a/scripts/get_s3_permissions.py b/scripts/get_s3_permissions.py
@@ -101,7 +101,7 @@ def add_feature_test_files(local_path):
             pointer_types,
             access_controls,
         )
-        for actor_type, entries in permissions.items()
+        for actor_type, entries in org_permissions.items()
         for app_id, ods_code, pointer_types, access_controls in entries
     ]
     app_permissions = {

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ def add_feature_test_files(local_path):`
`101`	`101`	`pointer_types,`
`102`	`102`	`access_controls,`
`103`	`103`	`)`
`104`		`- for actor_type, entries in permissions.items()`
	`104`	`+ for actor_type, entries in org_permissions.items()`
`105`	`105`	`for app_id, ods_code, pointer_types, access_controls in entries`
`106`	`106`	`]`
`107`	`107`	`app_permissions = {`