BACKPORT-CONFLICT

freifunkMUC · Jan 28, 2025 · 4a9953d · 4a9953d
1 parent 22df94e
commit 4a9953d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/.github/workflows/bump-modules.yml b/.github/workflows/bump-modules.yml
@@ -39,7 +39,11 @@ jobs:
 
       - name: Create Pull Request
         id: cpr
+<<<<<<< HEAD
         uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c # v6.1.0
+=======
+        uses: peter-evans/create-pull-request@67ccf781d68cd99b580ae25a5c18a1cc84ffff1f # v7.0.6
+>>>>>>> 574a0bb (build(deps): bump peter-evans/create-pull-request from 7.0.5 to 7.0.6)
         with:
           token: ${{ steps.app-token.outputs.token }}
           title: '[${{ github.ref_name }}] update modules'

diff --git a/.github/workflows/update-targets.yml b/.github/workflows/update-targets.yml
@@ -46,7 +46,11 @@ jobs:
           echo "names=$(git diff --color=always|perl -wlne 'print $1 if /^\e\[32m\+\e\[m\e\[32m(.*)\e\[m$/' | tr '\n' ' ')" >> $GITHUB_OUTPUT
 
       - name: Create Pull Request
+<<<<<<< HEAD
         uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c # v6.1.0
+=======
+        uses: peter-evans/create-pull-request@67ccf781d68cd99b580ae25a5c18a1cc84ffff1f # v7.0.6
+>>>>>>> 574a0bb (build(deps): bump peter-evans/create-pull-request from 7.0.5 to 7.0.6)
         with:
           token: ${{ steps.app-token.outputs.token }}
           title: '[${{ github.ref_name }}] Add targets ${{ steps.new-targets.outputs.names }}'