🐛 fix merge errors

equinor · Feb 18, 2025 · 2360ec2 · 2360ec2
1 parent b26bf5e
commit 2360ec2
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 43 deletions.
diff --git a/web/core/Carousel/Carousel.tsx b/web/core/Carousel/Carousel.tsx
@@ -71,8 +71,6 @@ type CarouselProps = {
   autoRotation?: boolean
   hasSectionTitle?: boolean
   title?: PortableTextBlock[]
-  /* The component to use to display default carousel item */
-  defaultItemContainer?: React.JSXElementConstructor<React.HTMLAttributes<HTMLElement>>
 } & Omit<HTMLAttributes<HTMLDivElement>, 'title'>
 
 const TRANSLATE_X_AMOUNT_LG = 1000
@@ -90,7 +88,6 @@ export const Carousel = forwardRef<HTMLElement, CarouselProps>(function Carousel
     className = '',
     listClassName = '',
     hasSectionTitle = false,
-    defaultItemContainer: DefaultItemContainer,
   },
   ref,
 ) {

diff --git a/web/core/Carousel/CarouselDefaultItem.tsx b/web/core/Carousel/CarouselDefaultItem.tsx