fixup

SU-SWS · May 2, 2024 · 0de0006 · 0de0006
1 parent 0c79fb9
commit 0de0006
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/.storybook/stories/storybook-entities.tsx b/.storybook/stories/storybook-entities.tsx
@@ -27,13 +27,8 @@ export const getStoryBookImage = (imageUrl?: string): MediaImage => {
       width: 1500,
       alt: "Placeholder Image",
       size: 123,
-<<<<<<< HEAD
-      focalX: 50,
-      focalY: 50
-=======
       focalY: 50,
       focalX: 50,
->>>>>>> 1.x
     }
   }
 }