3 Commits

Author	SHA1	Message	Date
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