From ff8a1b836c8e33a766e0e18f87fed315f9cbae52 Mon Sep 17 00:00:00 2001
From: Linus Flood <linus.flood@scandichotels.com>
Date: Wed, 20 Nov 2024 13:44:34 +0100
Subject: [PATCH] Fix merge issues

---
 .../hotelreservation/[...path]/page.tsx       | 21 ++++++++++++++++++
 app/[lang]/(live)/@footer/[...path]/page.tsx  | 22 +------------------
 2 files changed, 22 insertions(+), 21 deletions(-)
 create mode 100644 app/[lang]/(live)/@bookingwidget/hotelreservation/[...path]/page.tsx

diff --git a/app/[lang]/(live)/@bookingwidget/hotelreservation/[...path]/page.tsx b/app/[lang]/(live)/@bookingwidget/hotelreservation/[...path]/page.tsx
new file mode 100644
index 000000000..1a77e08c1
--- /dev/null
+++ b/app/[lang]/(live)/@bookingwidget/hotelreservation/[...path]/page.tsx
@@ -0,0 +1,21 @@
+import { env } from "@/env/server"
+
+import BookingWidget, { preload } from "@/components/BookingWidget"
+
+import { PageArgs } from "@/types/params"
+
+export default async function BookingWidgetHotelReservationPage({
+  searchParams,
+}: PageArgs<{}, URLSearchParams>) {
+  if (env.HIDE_BOOKINGWIDGET_HOTELRESERVATION_PATH) {
+    return null
+  }
+
+  preload()
+
+  return <BookingWidget searchParams={searchParams} />
+}
+
+// TODO: This should just:
+// export { default } from "../page"
+// when current web is no more
diff --git a/app/[lang]/(live)/@footer/[...path]/page.tsx b/app/[lang]/(live)/@footer/[...path]/page.tsx
index 1a77e08c1..03a82e5f5 100644
--- a/app/[lang]/(live)/@footer/[...path]/page.tsx
+++ b/app/[lang]/(live)/@footer/[...path]/page.tsx
@@ -1,21 +1 @@
-import { env } from "@/env/server"
-
-import BookingWidget, { preload } from "@/components/BookingWidget"
-
-import { PageArgs } from "@/types/params"
-
-export default async function BookingWidgetHotelReservationPage({
-  searchParams,
-}: PageArgs<{}, URLSearchParams>) {
-  if (env.HIDE_BOOKINGWIDGET_HOTELRESERVATION_PATH) {
-    return null
-  }
-
-  preload()
-
-  return <BookingWidget searchParams={searchParams} />
-}
-
-// TODO: This should just:
-// export { default } from "../page"
-// when current web is no more
+export { default } from "../page"