From 9c48d0c63f08af687ec6d77b8377992ec7602f40 Mon Sep 17 00:00:00 2001
From: Youssef <khedher.youssef@hotmail.fr>
Date: Fri, 25 Feb 2022 13:49:59 +0100
Subject: [PATCH] fix: merge conflicts

---
 .../src/component/context/CreateContext/CreateContext.tsx   | 6 +++---
 frontend/src/component/context/EditContext/EditContext.tsx  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/src/component/context/CreateContext/CreateContext.tsx b/frontend/src/component/context/CreateContext/CreateContext.tsx
index 0aa96d34ba..bba6d66b96 100644
--- a/frontend/src/component/context/CreateContext/CreateContext.tsx
+++ b/frontend/src/component/context/CreateContext/CreateContext.tsx
@@ -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}
diff --git a/frontend/src/component/context/EditContext/EditContext.tsx b/frontend/src/component/context/EditContext/EditContext.tsx
index 979f7ab1b5..56ab77b099 100644
--- a/frontend/src/component/context/EditContext/EditContext.tsx
+++ b/frontend/src/component/context/EditContext/EditContext.tsx
@@ -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}