diff options
| author | Walker Selby <git@walkerselby.com> | 2023-11-22 12:20:15 +0000 |
|---|---|---|
| committer | Walker Selby <git@walkerselby.com> | 2023-11-22 12:20:15 +0000 |
| commit | 514d3f0ec1eb3a7900206ac0b0469d922828b506 (patch) | |
| tree | 0a0dba7248bcb6acfa0f5fbb7526cc4ee0ea9bba /.github | |
| parent | bf225d26b399fcc3fd258d7acbdedb1e76154b8e (diff) | |
| parent | a6de55740355b3bc4d7c869626d22da5b3854416 (diff) | |
| download | skyhanni-514d3f0ec1eb3a7900206ac0b0469d922828b506.tar.gz skyhanni-514d3f0ec1eb3a7900206ac0b0469d922828b506.tar.bz2 skyhanni-514d3f0ec1eb3a7900206ac0b0469d922828b506.zip | |
Merge branch 'beta' into https
# Conflicts:
# src/main/java/SkyHanniInstallerFrame.java
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/label-merge-conflict.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.github/workflows/label-merge-conflict.yml b/.github/workflows/label-merge-conflict.yml index d4e693f7b..6c0268d6c 100644 --- a/.github/workflows/label-merge-conflict.yml +++ b/.github/workflows/label-merge-conflict.yml @@ -22,5 +22,5 @@ jobs: dirtyLabel: "Merge Conflicts" #removeOnDirtyLabel: "PR: ready to ship" repoToken: "${{ secrets.GITHUB_TOKEN }}" - commentOnDirty: "This pull request has conflicts with the base branch. Please resolve those so we can evaluate the pull request." - commentOnClean: "Conflicts have been resolved! 🎉 A maintainer will review the pull request shortly." + commentOnDirty: "This pull request has conflicts with the base branch \"beta\". Please resolve those so we can test out your changes." + commentOnClean: "Conflicts have been resolved! 🎉" |