Resolve conflicts..

docs/SETUP.md

@@ -22,11 +22,12 @@
    ```
 4. Run the application:
    ```bash
-   bun run dev
+   bun --bun run dev
    ```
-5. Build the application:
+
+(ONLY FOR PRODUCTION!!) Build the application:
    ```bash
-   bun run build
+   bun --bun run build
    ```
 ## Accessing the Application
 - The application is now running at `http://localhost:3000`.

src/app/[locale]/page.tsx

@@ -232,7 +232,11 @@ 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}

translations/et.json

@@ -116,6 +116,7 @@
       "buyTicket": "OSTA PILET"
     },
     "mini": {
+      "titleSingular": "Miniturniiride",
       "title": "Miniturniirid",
       "timing": "Toimumisaeg veel selgumisel",
       "description1": "TipiLANil toimub mitmeid erinevaid lõbusaid ja võistlushimu tekitavaid miniturniire. Miniturniirid toimuvad järgnevates mängudes: SimRacing, Tekken, FIFA, Minecraft Bedwars, Buckshot Roulette, LostGamer ja palju muud.",