Mirrors/unleash.unleash
1
0
Fork 0
mirror of https://github.com/Unleash/unleash.git synced 2025-02-23 00:22:19 +01:00
Code Issues Projects Releases Wiki Activity

fix: merge conflicts

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/src/component/context/CreateContext/CreateContext.tsx
View File

@ -47,8 +47,8 @@ export const CreateContext = () => {
confetti: true, confetti: true,
type: 'success', type: 'success',
}); });
} catch (err: unknown) { } catch (error: unknown) {
setToastApiError(formatUnknownError(err)); setToastApiError(formatUnknownError(error));
} }
} }
}; };
@ -70,7 +70,7 @@ export const CreateContext = () => {
<FormTemplate <FormTemplate
loading={loading} loading={loading}
title="Create context" 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." 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" documentationLink="https://docs.getunleash.io/how-to/how-to-define-custom-context-fields"
formatApiCode={formatApiCode} formatApiCode={formatApiCode}

2
frontend/src/component/context/EditContext/EditContext.tsx
View File

@ -77,7 +77,7 @@ export const EditContext = () => {
<FormTemplate <FormTemplate
loading={loading} loading={loading}
title="Edit context" 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." 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" documentationLink="https://docs.getunleash.io/how-to/how-to-define-custom-context-fields"
formatApiCode={formatApiCode} formatApiCode={formatApiCode}