Fix merge conflicts

This commit is contained in:
adrinr 2023-03-20 16:28:35 +00:00
parent beb4118582
commit 10e465e07d
2 changed files with 4 additions and 4 deletions

View File

@ -49,9 +49,9 @@ describe("/api/global/scim/v2/groups", () => {
const featureDisabledResponse = {
error: {
code: "feature_disabled",
featureName: "scimIntegration",
featureName: "scim",
},
message: "scimIntegration is not currently enabled",
message: "scim is not currently enabled",
status: 400,
}

View File

@ -77,9 +77,9 @@ describe("/api/global/scim/v2/users", () => {
const featureDisabledResponse = {
error: {
code: "feature_disabled",
featureName: "scimIntegration",
featureName: "scim",
},
message: "scimIntegration is not currently enabled",
message: "scim is not currently enabled",
status: 400,
}