feat(sw-187): fix merge conflicts

This commit is contained in:
Pontus Dreij
2024-09-04 09:22:37 +02:00
parent 35793c1dd1
commit 4b6a4670ca
3 changed files with 50 additions and 174 deletions

View File

@@ -127,7 +127,46 @@ export const footer = {
],
},
],
tertiaryLinks: [
{
title: "Cookies",
href: "/cookies",
id: "cookies",
},
{
title: "Privacy policy",
href: "/privacy",
id: "privacy",
},
],
languageSwitcher: {
urls: {
da: {
url: "https://www.scandichotels.com/da",
isExternal: true,
},
de: {
url: "https://www.scandichotels.com/de",
isExternal: true,
},
en: {
url: "https://www.scandichotels.com/en",
isExternal: true,
},
fi: {
url: "https://www.scandichotels.com/fi",
isExternal: true,
},
no: {
url: "https://www.scandichotels.com/no",
isExternal: true,
},
sv: {
url: "https://www.scandichotels.com/sv",
isExternal: true,
},
},
},
copyrightCompany: "Scandic AB",
copyrightInfo: "All rights reserved.",
socialMedia: {
@@ -149,171 +188,4 @@ export const footer = {
},
],
},
tertiaryLinks: [
{
title: "Cookies",
href: "/cookies",
id: "cookies",
},
{
title: "Privacy policy",
href: "/privacy",
id: "privacy",
},
],
languageSwitcher: {
urls: {
da: {
url: "https://www.scandichotels.com/da",
isExternal: true,
},
de: {
url: "https://www.scandichotels.com/de",
isExternal: true,
},
en: {
url: "https://www.scandichotels.com/en",
isExternal: true,
},
fi: {
url: "https://www.scandichotels.com/fi",
isExternal: true,
},
no: {
url: "https://www.scandichotels.com/no",
isExternal: true,
},
sv: {
url: "https://www.scandichotels.com/sv",
isExternal: true,
},
},
},
}
copyrightCompany: "Scandic AB",
copyrightInfo: "All rights reserved.",
socialMedia: {
links: [
{
title: "Facebook",
href: "https://www.facebook.com/scandichotels/",
id: "facebook",
},
{
title: "Instagram",
href: "https://www.instagram.com/scandichotels/",
id: "instagram",
},
{
title: "Tripadvisor",
href: "https://www.tripadvisor.com/Hotel_Review-g297628-d1020208712-Reviews-Scandic_Hotels-Stockholm_Sweden.html",
id: "tripadvisor",
},
],
},
tertiaryLinks: [
{
title: "Cookies",
href: "/cookies",
id: "cookies",
},
{
title: "Privacy policy",
href: "/privacy",
id: "privacy",
},
],
languageSwitcher: {
urls: {
da: {
url: "https://www.scandichotels.com/da",
isExternal: true,
},
de: {
url: "https://www.scandichotels.com/de",
isExternal: true,
},
en: {
url: "https://www.scandichotels.com/en",
isExternal: true,
},
fi: {
url: "https://www.scandichotels.com/fi",
isExternal: true,
},
no: {
url: "https://www.scandichotels.com/no",
isExternal: true,
},
sv: {
url: "https://www.scandichotels.com/sv",
isExternal: true,
},
},
},
}
export const detailsData = {
copyrightCompany: "© 2024 Scandic AB",
copyrightInfo: "All rights reserved.",
socialMedia: {
links: [
{
title: "Facebook",
href: "https://www.facebook.com/scandichotels/",
id: "facebook",
},
{
title: "Instagram",
href: "https://www.instagram.com/scandichotels/",
id: "instagram",
},
{
title: "Tripadvisor",
href: "https://www.tripadvisor.com/Hotel_Review-g297628-d1020208712-Reviews-Scandic_Hotels-Stockholm_Sweden.html",
id: "tripadvisor",
},
],
},
tertiaryLinks: [
{
title: "Cookies",
href: "/cookies",
id: "cookies",
},
{
title: "Privacy policy",
href: "/privacy",
id: "privacy",
},
],
languageSwitcher: {
urls: {
da: {
url: "https://www.scandichotels.com/da",
isExternal: true,
},
de: {
url: "https://www.scandichotels.com/de",
isExternal: true,
},
en: {
url: "https://www.scandichotels.com/en",
isExternal: true,
},
fi: {
url: "https://www.scandichotels.com/fi",
isExternal: true,
},
no: {
url: "https://www.scandichotels.com/no",
isExternal: true,
},
sv: {
url: "https://www.scandichotels.com/sv",
isExternal: true,
},
},
},
}