Bump olivernybroe/action-conflict-finder from 3.0 to 4.0

[dependabot[bot]]

Bumps olivernybroe/action-conflict-finder from 3.0 to 4.0.

Release notes

Sourced from olivernybroe/action-conflict-finder's releases.

v4.0

What's Changed

• Update readme with version that exists by @​alberthaff in olivernybroe/action-conflict-finder#9
• Refctored the action so that it no longer needs to run under docker by @​credfeto in olivernybroe/action-conflict-finder#10

New Contributors

• @​alberthaff made their first contribution in olivernybroe/action-conflict-finder#9

Full Changelog: https://github.com/olivernybroe/action-conflict-finder/compare/v3.0...v4.0

Commits

• 78f7add Update README.md
• f537e41 Merge pull request #10 from credfeto/feat/avoid-docker
• 2022774 Removed Dockerfile now it is not needed
• d9ca0c3 Changed README.md so reads a bit better
• 23bbd7c Switching to use a composite action workflow rather than docker
• 02c0b5e Switching to use a composite action workflow rather than docker
• d42de85 use the action in the same repo
• ce2166f use the action in the same repo
• 956a993 use the action in the same repo
• f1e2f51 use the action in the same repo
• Additional commits viewable in compare view

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.

---

Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

[dependabot[bot]]

The following labels could not be found: infrastructure, pr:change.

[dependabot[bot]]

Looks like olivernybroe/action-conflict-finder is up-to-date now, so this is no longer needed.