From 60ad418a7829b1c73270bcf8019b97f5dcebc7a9 Mon Sep 17 00:00:00 2001
From: quirinecker <quirin.ecker@bajupa.com>
Date: Mon, 12 Feb 2024 12:35:52 +0100
Subject: [PATCH] fixed merge conflict

---
 src/App.vue | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index a565a30..98a0ae9 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -169,17 +169,10 @@ function createInterval() {
         }
 
 
-<<<<<<< HEAD
-		if (currentCoin.value.x === snake.value.cell.x && currentCoin.value.y === snake.value.cell.y) {
-			snake.value.length++
-			currentCoin.value = spawnCoin()
-			score.value++
-=======
         if (currentCoin.value.x === snake.value.cell.x && currentCoin.value.y === snake.value.cell.y) {
             snake.value.length++
             currentCoin.value = spawnCoin()
             score.value++
->>>>>>> 61ad940 (scoreboard is implemented in the frontend)
 
             if (currentInterval) {
                 clearInterval(currentInterval)
@@ -308,9 +301,6 @@ window.addEventListener('keydown', keydown)
     width: 10px;
     overflow: hidden;
 }
-<<<<<<< HEAD
-</style>
-=======
 
 main {
     display: flex;
@@ -340,10 +330,6 @@ main {
     justify-content: space-between;
     width: 100%;
 }
-<<<<<<< HEAD
-</style>
->>>>>>> bf4a773 (added basic scoreboard for now)
-=======
 
 .scoreboard-username {
     font-weight: 600;
@@ -354,9 +340,5 @@ input {
     padding: 5px;
     width: 100%;
 }
-<<<<<<< HEAD
-</style>
->>>>>>> 61ad940 (scoreboard is implemented in the frontend)
-=======
-</style>
->>>>>>> 20fbb60 (fixed snake length)
+
+</style>
\ No newline at end of file