Merge branch 'release/3' into release/2

mbuchoff · Jul 25, 2024 · 3186a8a · 3186a8a
2 parents 8ebfb4b + 292c499
commit 3186a8a
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 5 deletions.
diff --git a/.github/workflows/merge-forward 2.yaml b/.github/workflows/merge-forward 2.yaml
@@ -42,7 +42,6 @@ jobs:
     - name: Trigger Secondary Workflow on Different Branch
       uses: benc-uk/workflow-dispatch@v1
       with:
-        owner: ${{ github.repository_owner }}
         repo: ${{ github.event.repository.name }}
         workflow: merge-forward 2.yml
         token: ${{ secrets.GITHUB_TOKEN }}

diff --git a/devops_description 2.txt b/devops_description 2.txt
@@ -3,7 +3,3 @@ Hello!
 World.
 
 It's mike
-
-Goodbye
-
-asdf