Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
chore: update merge conflict workflow to correct repo
Kyle Mendell33a5bc9414d4
diff --git a/.github/workflows/merge-conflict.yml b/.github/workflows/merge-conflict.ymlindex 2febe08d9..0633d91e8 100644--- a/.github/workflows/merge-conflict.yml+++ b/.github/workflows/merge-conflict.yml@@ -13,7 +13,7 @@ jobs:label:name: Labelingruns-on: ubuntu-latest- if: ${{ github.repository == 'ofkm/arcane' }}+ if: ${{ github.repository == 'getarcaneapp/arcane' }}permissions:contents: readpull-requests: write@@ -21,6 +21,6 @@ jobs:- name: Apply labeluses: eps1lon/actions-label-merge-conflict@v3with:- dirtyLabel: 'merge conflict'- commentOnDirty: 'This pull request has merge conflicts. Please resolve the conflicts so the PR can be successfully reviewed and merged.'- repoToken: '${{ secrets.GITHUB_TOKEN }}'+ dirtyLabel: "merge conflict"+ commentOnDirty: "This pull request has merge conflicts. Please resolve the conflicts so the PR can stay up-to-date and reviewed."+ repoToken: "${{ secrets.GITHUB_TOKEN }}"