Merge pull request #62 from Lapikud/main

Keep up to date with main
3 months ago · 1b29f85322
parent 2115e80517 66f75aca4d
commit 1b29f85322
1 changed files with 0 additions and 4 deletions
--- a/src/app/[locale]/page.tsx
+++ b/src/app/[locale]/page.tsx
@ -232,11 +232,7 @@ export default async function Home({
            </NextLink>
            <NextLink href="https://www.arvutimuuseum.ee" target="_blank">
              <Image
-<<<<<<< HEAD
                src="/sponsors/arvutimuuseum.svg"
-=======
-                src="/sponsors/arvutimuuseum.png"
->>>>>>> f26f8518b4bc260c3098e534cc7ac7fdce081394
                alt="Arvutimuuseum"
                width={200}
                height={200}