2 Commits

Author	SHA1	Message	Date
dependabot[bot]	9ae2611493	chore(deps): bump eps1lon/actions-label-merge-conflict (#9187) ... Bumps [eps1lon/actions-label-merge-conflict](https://github.com/eps1lon/actions-label-merge-conflict) from 2.0.1 to 2.1.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.0.1...v2.1.0) --- updated-dependencies: - dependency-name: eps1lon/actions-label-merge-conflict dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-01-02 11:47:18 -05:00
David Ordás	0e75c6d59b	ci(conflicts): create conflicts.yml workflow (#7104) ... * ci(conflicts): create `conflicts.yml` workflow * typo: state -> status * use section url instead of article url * Refine "comment on dirty" text Co-authored-by: ImVector <59611597+LuigiImVector@users.noreply.github.com> * fix: grammar The 'you' after 'advance' and before 'for' should not be there. Co-authored-by: Biswadeep Purkayastha <98874428+metabiswadeep@users.noreply.github.com> Co-authored-by: ImVector <59611597+LuigiImVector@users.noreply.github.com> Co-authored-by: Biswadeep Purkayastha <98874428+metabiswadeep@users.noreply.github.com>	2022-10-19 16:03:13 -04:00