Merge branch 'release/3' into release/2

# Conflicts: # .github/workflows/merge-forward.yaml
mbuchoff · Jul 24, 2024 · b0a16d1 · b0a16d1
2 parents f84e4a8 + 66ee903
commit b0a16d1
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 42 deletions.
diff --git a/.github/workflows/chatgpt.yaml → .github/workflows/chatgpt b/.github/workflows/chatgpt.yaml → .github/workflows/chatgpt
diff --git a/.github/workflows/merge-forward b/.github/workflows/merge-forward
diff --git a/.github/workflows/merge-forward.yaml b/.github/workflows/merge-forward.yaml
@@ -1,4 +1,4 @@
-name: Release Workflow
+name: Release Workflow 2
 
 on:
   push:

diff --git a/devops_description 2.txt b/devops_description 2.txt
@@ -1 +1,3 @@
-Hello!
+Hello!
+
+World.