From 49c6de2e0461ef9b73a13e4b9dc93d8c7a1802aa Mon Sep 17 00:00:00 2001 From: Fredrik Thorsson Date: Fri, 22 Nov 2024 09:24:37 +0100 Subject: [PATCH] feat(SW-914): add correct import --- .../ContentType/HotelPage/SidePeeks/index.ts | 4 ++++ components/ContentType/HotelPage/index.tsx | 14 ++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/components/ContentType/HotelPage/SidePeeks/index.ts b/components/ContentType/HotelPage/SidePeeks/index.ts index 5da71bbcd..915d17c5e 100644 --- a/components/ContentType/HotelPage/SidePeeks/index.ts +++ b/components/ContentType/HotelPage/SidePeeks/index.ts @@ -1,3 +1,7 @@ export { default as AboutTheHotelSidePeek } from "./AboutTheHotel" +<<<<<<< HEAD export { default as RoomSidePeek } from "./Room" +======= +export { default as AmenitiesSidePeek } from "./Amenities" +>>>>>>> de3b70ce (feat(SW-914): add correct import) export { default as WellnessAndExerciseSidePeek } from "./WellnessAndExercise" diff --git a/components/ContentType/HotelPage/index.tsx b/components/ContentType/HotelPage/index.tsx index 969d75936..15b3db9d5 100644 --- a/components/ContentType/HotelPage/index.tsx +++ b/components/ContentType/HotelPage/index.tsx @@ -30,7 +30,11 @@ import PreviewImages from "./PreviewImages" import { Rooms } from "./Rooms" import { AboutTheHotelSidePeek, +<<<<<<< HEAD RoomSidePeek, +======= + AmenitiesSidePeek, +>>>>>>> de3b70ce (feat(SW-914): add correct import) WellnessAndExerciseSidePeek, } from "./SidePeeks" import TabNavigation from "./TabNavigation" @@ -177,6 +181,7 @@ export default async function HotelPage({ hotelId }: HotelPageProps) { ) : null} +<<<<<<< HEAD +======= + {/* eslint-disable import/no-named-as-default-member */} + +>>>>>>> de3b70ce (feat(SW-914): add correct import) - +