From 21d92b8b86471acff8649e572bd15253888e89b0 Mon Sep 17 00:00:00 2001
From: Schallbert <schallbert@mailbox.org>
Date: Mon, 9 Sep 2024 12:50:09 +0200
Subject: [PATCH] complete merge

---
 .gitea/workflows/deploy-lectures.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.gitea/workflows/deploy-lectures.yml b/.gitea/workflows/deploy-lectures.yml
index 613a547..99ac952 100644
--- 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