Mirrors/Stirling-PDF
1
0
Fork 0
mirror of https://github.com/Frooodle/Stirling-PDF.git synced 2026-02-17 13:52:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

conflict fix again

Browse Source
This commit is contained in:
Anthony Stirling
2025-10-12 21:13:01 +01:00
parent 45c438d66d
commit 884944527e
36 changed files with 74 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.github/workflows/PR-Demo-Comment-with-react.yml vendored
View File

@@ -45,11 +45,7 @@ jobs:
egress-policy: audit
- name: Checkout PR
<<<<<<< HEAD
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
=======
uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
>>>>>>> refs/remotes/origin/V2
- name: Setup GitHub App Bot
if: github.actor != 'dependabot[bot]'
@@ -137,11 +133,7 @@ jobs:
egress-policy: audit
- name: Checkout PR
<<<<<<< HEAD
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
=======
uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
>>>>>>> refs/remotes/origin/V2
- name: Setup GitHub App Bot
if: github.actor != 'dependabot[bot]'
@@ -153,11 +145,7 @@ jobs:
private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
- name: Checkout PR
<<<<<<< HEAD
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
=======
uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
>>>>>>> refs/remotes/origin/V2
with:
ref: refs/pull/${{ needs.check-comment.outputs.pr_number }}/merge
token: ${{ steps.setup-bot.outputs.token }}