diff --git a/.github/workflows/merge-conflict.yml b/.github/workflows/merge-conflict.yml index 424a1c0..89b0398 100644 --- a/.github/workflows/merge-conflict.yml +++ b/.github/workflows/merge-conflict.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Check if PRs are have merge conflicts - uses: eps1lon/actions-label-merge-conflict@v2.1.0 + uses: eps1lon/actions-label-merge-conflict@v3.0.0 with: dirtyLabel: "Merge Conflict" repoToken: "${{ secrets.GITHUB_TOKEN }}" diff --git a/src/bash_functions.sh b/src/bash_functions.sh index 48cf90d..814b8e7 100644 --- a/src/bash_functions.sh +++ b/src/bash_functions.sh @@ -65,7 +65,7 @@ ensure_basic_configuration() { if [[ $(getFTLConfigValue "dns.upstreams") == "[]" ]]; then echo "" echo " [X] No DNS upstream servers are set!" - echo " [i] Recommended: Set the upstream DNS servers in the environment variable FTLCONF_dns_upstream" + echo " [i] Recommended: Set the upstream DNS servers in the environment variable FTLCONF_dns_upstreams" echo "" exit 1 fi