7 commits

Author	SHA1	Message	Date
Joshua M. Boniface	67f3e8a119	Remove comma splice from new message	2023-03-22 11:05:36 -04:00
Bill Thornton	b72762bc86	Add merge conflict comment	2023-03-22 10:55:37 -04:00
renovate[bot]	bf1378e73e	Update eps1lon/actions-label-merge-conflict action to v2.1.0	2022-10-31 09:41:44 +00:00
renovate[bot]	92a374340d	Pin dependencies	2022-08-17 17:22:21 +00:00
Bill Thornton	9c2c84cb64	Update merge conflict action trigger	2021-08-09 11:29:22 -04:00
Fernando Fernández	0f42f9afbc	Address review comments	2021-06-23 20:58:45 +02:00
Fernando Fernández	fbbafa2e2d	Format workflow as in other repos and address review comments	2021-06-23 20:54:40 +02:00

Renamed from .github/workflows/merge-conflicts.yml (Browse further)