From 43f9a21a4776f61a539a31fa0bd2ca64f26b5244 Mon Sep 17 00:00:00 2001
From: Fredrik Thorsson <fredrik.thorsson@scandichotels.com>
Date: Wed, 27 Nov 2024 09:45:08 +0100
Subject: [PATCH] feat(SW-914): fix merge hickup

---
 .../ContentType/HotelPage/SidePeeks/index.ts    |  7 -------
 components/ContentType/HotelPage/index.tsx      | 17 +----------------
 2 files changed, 1 insertion(+), 23 deletions(-)

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}
       <SidePeekProvider>
-<<<<<<< HEAD
+        {/* eslint-disable import/no-named-as-default-member */}
         <SidePeek
           contentKey={amenities[lang]}
           title={intl.formatMessage({ id: "Amenities" })}
@@ -193,13 +185,6 @@ export default async function HotelPage({ hotelId }: HotelPageProps) {
           {/* TODO: Render amenities as per the design. */}
           Read more about the amenities here
         </SidePeek>
-=======
-        {/* eslint-disable import/no-named-as-default-member */}
-<<<<<<< HEAD
-        <AmenitiesSidePeek amenitiesList={hotelDetailedFacilities} />
->>>>>>> de3b70ce (feat(SW-914): add correct import)
-=======
->>>>>>> d2b749c0 (feat(SW-914): merge changes)
         <AboutTheHotelSidePeek
           hotelAddress={address}
           coordinates={location}