Fix merge conflicts
This commit is contained in:
parent
beb4118582
commit
10e465e07d
|
@ -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,
|
||||
}
|
||||
|
||||
|
|
|
@ -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,
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue