Rename Conflict marking to conflicts.yml

This commit is contained in:
Yair Morgenstern
2022-10-09 12:22:08 +03:00
committed by GitHub
parent a17c04619b
commit dee6c59bfa