From a310eead38afa27e5226a7b17fc93ec0f67fc2e7 Mon Sep 17 00:00:00 2001
From: Debra Toranska <dobroslawa.toranska@sage.com>
Date: Mon, 16 Oct 2023 17:44:36 +0100
Subject: [PATCH] chore(button-toggle): prettier fix

---
 .../button-toggle/button-toggle-test.stories.tsx       | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/components/button-toggle/button-toggle-test.stories.tsx b/src/components/button-toggle/button-toggle-test.stories.tsx
index 814222ab4e..58c31e5ed5 100644
--- a/src/components/button-toggle/button-toggle-test.stories.tsx
+++ b/src/components/button-toggle/button-toggle-test.stories.tsx
@@ -60,16 +60,6 @@ export const ButtonToggleGroupMinorStory = () => {
       fieldHelp="field help mesage"
       onChange={onChangeHandler}
       value={value}
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-      variant="minor"
->>>>>>> 8c445eebb (feat(button-toggle): add minor child)
-=======
->>>>>>> 71a7991e9 (feat(button-toggle): rm variant prop, tests)
->>>>>>> df20abe7b (feat(button-toggle): rm variant prop)
     >
       <ButtonToggle value="foo">Foo</ButtonToggle>
       <ButtonToggle value="bar">Bar</ButtonToggle>