merge

t-lohse · Jul 9, 2024 · 46b8aa1 · 46b8aa1
1 parent 9c3508e
commit 46b8aa1
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -1,7 +1,12 @@
 name: "Release"
 
+<<<<<<< HEAD
 on:
   workflow_run:
+=======
+on: push
+  #workflow_run:
+>>>>>>> 3baf2b2 (upd)
     #workflows: ["Tex format CI"]
     #types: [completed]
     #branches: "main"