From 416ca62591b9f04a413fc7d09f48a6ca5fc0dc53 Mon Sep 17 00:00:00 2001
From: Scratch-hv | Oeil-de-Lynx
 <104771596+OeildeLynx31@users.noreply.github.com>
Date: Mon, 22 Apr 2024 14:06:31 +0000
Subject: [PATCH] Fix again issue with merge conflicts

---
 src/resources/blocks/player.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/resources/blocks/player.js b/src/resources/blocks/player.js
index be2aadb..8c08f4b 100644
--- a/src/resources/blocks/player.js
+++ b/src/resources/blocks/player.js
@@ -323,7 +323,7 @@ function register() {
         }`;
         return `${code}\n`;
     })
-}
+
 
     registerBlock(`${categoryPrefix}keypressed`, {
         message0: 'when in game key %1 pressed do %2 %3',
@@ -350,6 +350,7 @@ function register() {
             if(ev.key == ${MENU3}){${BLOCKS}}});`;
         return `${code}\n`;
     })
+}
 
 const keyBoard = [
     ["SPACE", "57"],