1
0
mirror of https://github.com/Unleash/unleash.git synced 2025-02-23 00:22:19 +01:00

fix: merge conflicts

This commit is contained in:
Youssef 2022-02-25 13:49:59 +01:00
parent 4898eee8d8
commit 9c48d0c63f
2 changed files with 4 additions and 4 deletions

View File

@ -47,8 +47,8 @@ export const CreateContext = () => {
confetti: true,
type: 'success',
});
} catch (err: unknown) {
setToastApiError(formatUnknownError(err));
} catch (error: unknown) {
setToastApiError(formatUnknownError(error));
}
}
};
@ -70,7 +70,7 @@ export const CreateContext = () => {
<FormTemplate
loading={loading}
title="Create context"
description="Context fields are a basic building block used in Unleash to control roll-out.
description="Context fields are a basic building block used in Unleash to control roll-out.
They can be used together with strategy constraints as part of the activation strategy evaluation."
documentationLink="https://docs.getunleash.io/how-to/how-to-define-custom-context-fields"
formatApiCode={formatApiCode}

View File

@ -77,7 +77,7 @@ export const EditContext = () => {
<FormTemplate
loading={loading}
title="Edit context"
description="Context fields are a basic building block used in Unleash to control roll-out.
description="Context fields are a basic building block used in Unleash to control roll-out.
They can be used together with strategy constraints as part of the activation strategy evaluation."
documentationLink="https://docs.getunleash.io/how-to/how-to-define-custom-context-fields"
formatApiCode={formatApiCode}