Resolve merge conflict and set server port to 80

.gitea/workflows/deploy.yml

@@ -1,19 +1,15 @@
-# Gitea Deployment Workflow for TrassenPlaner
 name: Deploy TrassenPlaner
 run-name: ${{ gitea.actor }} is deploying the application
-
 on:
   push:
     branches:
       - main
-
 jobs:
   deploy:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v3
-
       - name: Deploy via SSH
         uses: appleboy/ssh-action@master
         with:
@@ -34,4 +30,4 @@ jobs:
             echo "DB_SCHEMA=wind_projekt_bwscheddebrock" >> .env
             
             docker compose up -d --build --force-recreate
-            docker image prune -f
+            docker image prune -f