fix merge conflicts

2 months ago · b584e3368b
parent ff5d06734a
commit b584e3368b
1 changed files with 7 additions and 0 deletions
--- a/pkg/services/org/orgimpl/org_delete_svc_test.go
+++ b/pkg/services/org/orgimpl/org_delete_svc_test.go
@ -52,10 +52,17 @@ func TestDeletionService_Delete(t *testing.T) {
 	requester = &identity.StaticRequester{
 		OrgID: 1,
 		Permissions: map[int64]map[string][]string{
+<<<<<<< HEAD
 			1: {
 				accesscontrol.ActionOrgsRead: {"*"},
 			},
 			2: {
+=======
+			1: map[string][]string{
+				accesscontrol.ActionOrgsRead: {"*"},
+			},
+			2: map[string][]string{
+>>>>>>> 5303a1cc7ed (Org: Fix org deletion (#106193))
 				accesscontrol.ActionOrgsRead: {"*"},
 			},
 		},