From 0de00069fa397100c1fa7e2dcfd2cc9a036236df Mon Sep 17 00:00:00 2001 From: rebeccahongsf Date: Thu, 2 May 2024 14:45:45 -0700 Subject: [PATCH] fixup --- .storybook/stories/storybook-entities.tsx | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.storybook/stories/storybook-entities.tsx b/.storybook/stories/storybook-entities.tsx index cd51e9ca..b267109a 100644 --- 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 } } }