complete merge

2024-09-09 12:50:09 +02:00 · 2024-09-09 12:50:09 +02:00 · 21d92b8b86
commit 21d92b8b86
parent 584143f778
1 changed files with 1 additions and 4 deletions
--- a/.gitea/workflows/deploy-lectures.yml
+++ b/.gitea/workflows/deploy-lectures.yml
@ -19,10 +19,7 @@ jobs:
      volumes: 
        # left: where the output will end up on disk, right: volume name inside container
        - /opt/caddy2/www/lectures:/workspace/schallbert/lectures/tmp
-<<<<<<< HEAD
        
-=======
->>>>>>> c5873d4a9d8c63783ffdbb07ed438cb7a41357e3
    steps:
      - name: --- CHECKOUT ---
        uses: actions/checkout@v3