Cleaning steps

.forgejo/workflows/generate_docker_image.yml

@@ -5,10 +5,6 @@ jobs:
     runs-on: bookworm
     container: docker
     steps:   
-      - name: Add NodeJs & Git
-        run: |
-          uname -a
-          apk add nodejs npm git          
       - name: Checkout repository
         uses: actions/checkout@v4
         with:

godot4/Dockerfile

@@ -28,11 +28,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     libxrandr-dev \
     && rm -rf /var/lib/apt/lists/*
 
-<<<<<<< HEAD
-ENV GODOT_VERSION="4.2.2-stable"
-=======
 ENV GODOT_VERSION="4.0.2-stable"
->>>>>>> d821de56600d8b8fc651f35d6369976482f5fc1a
 
 RUN wget https://github.com/godotengine/godot/releases/download/${GODOT_VERSION}/Godot_v${GODOT_VERSION}_linux.x86_64.zip \
     && wget https://github.com/godotengine/godot/releases/download/${GODOT_VERSION}/Godot_v${GODOT_VERSION}_export_templates.tpz \