3 Commits (32ab5aa50be8869d2610474a006eff5f2f275bdb)

Author	SHA1	Message	Date
dependabot[bot]	67ddb64bcc	Bump eps1lon/actions-label-merge-conflict from 2.1.0 to 3.0.0 ... Bumps [eps1lon/actions-label-merge-conflict](https://github.com/eps1lon/actions-label-merge-conflict) from 2.1.0 to 3.0.0. - [Release notes](https://github.com/eps1lon/actions-label-merge-conflict/releases) - [Changelog](https://github.com/eps1lon/actions-label-merge-conflict/blob/main/CHANGELOG.md) - [Commits](https://github.com/eps1lon/actions-label-merge-conflict/compare/v2.1.0...v3.0.0) --- updated-dependencies: - dependency-name: eps1lon/actions-label-merge-conflict dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2 months ago
Christian König	12674c0824	Shorten no merge conflict message ... Signed-off-by: Christian König <ckoenig@posteo.de>	1 year ago
Christian König	7562376373	Add merge-conflict workflow ... Signed-off-by: Christian König <ckoenig@posteo.de>	1 year ago