feat(sw-187): fix merge conflicts

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

View File

@@ -1,6 +1,6 @@
import LanguageSwitcher from "@/components/Current/Header/LanguageSwitcher"
import { getIconByIconName } from "@/components/Icons/get-icon-by-icon-name"
import Image from "@/components/Image"
import LanguageSwitcher from "@/components/LanguageSwitcher"
import Link from "@/components/TempDesignSystem/Link"
import Footnote from "@/components/TempDesignSystem/Text/Footnote"
import { getLang } from "@/i18n/serverContext"
@@ -84,7 +84,7 @@ export default function FooterDetails() {
{
// This will be changed to the new LangueSwitcher that is done in the header branch, when implementing contentstack
}
<LanguageSwitcher urls={languageSwitcher.urls} />
<LanguageSwitcher type="desktopFooter" urls={languageSwitcher.urls} />
</div>
</div>
</section>