diff --git a/components/ContentType/HotelPage/SidePeeks/index.ts b/components/ContentType/HotelPage/SidePeeks/index.ts index 246315043..5da71bbcd 100644 --- a/components/ContentType/HotelPage/SidePeeks/index.ts +++ b/components/ContentType/HotelPage/SidePeeks/index.ts @@ -1,10 +1,3 @@ export { default as AboutTheHotelSidePeek } from "./AboutTheHotel" -<<<<<<< HEAD -<<<<<<< HEAD export { default as RoomSidePeek } from "./Room" -======= -export { default as AmenitiesSidePeek } from "./Amenities" ->>>>>>> de3b70ce (feat(SW-914): add correct import) -======= ->>>>>>> d2b749c0 (feat(SW-914): merge changes) export { default as WellnessAndExerciseSidePeek } from "./WellnessAndExercise" diff --git a/components/ContentType/HotelPage/index.tsx b/components/ContentType/HotelPage/index.tsx index 556be2c5b..87fe388a5 100644 --- a/components/ContentType/HotelPage/index.tsx +++ b/components/ContentType/HotelPage/index.tsx @@ -28,19 +28,11 @@ import Facilities from "./Facilities" import IntroSection from "./IntroSection" import PreviewImages from "./PreviewImages" import { Rooms } from "./Rooms" -<<<<<<< HEAD import { AboutTheHotelSidePeek, -<<<<<<< HEAD RoomSidePeek, -======= - AmenitiesSidePeek, ->>>>>>> de3b70ce (feat(SW-914): add correct import) WellnessAndExerciseSidePeek, } from "./SidePeeks" -======= -import { AboutTheHotelSidePeek, WellnessAndExerciseSidePeek } from "./SidePeeks" ->>>>>>> d2b749c0 (feat(SW-914): merge changes) import TabNavigation from "./TabNavigation" import styles from "./hotelPage.module.css" @@ -185,7 +177,7 @@ export default async function HotelPage({ hotelId }: HotelPageProps) { ) : null} -<<<<<<< HEAD + {/* eslint-disable import/no-named-as-default-member */} -======= - {/* eslint-disable import/no-named-as-default-member */} -<<<<<<< HEAD - ->>>>>>> de3b70ce (feat(SW-914): add correct import) -======= ->>>>>>> d2b749c0 (feat(SW-914): merge changes)