Christof Marti c61f694532 Add merge-conflict label

2017-09-08 11:58:42 -07:00

..

classifier.yml

…

copycat.yml

…

insiders.yml

…

issue_template.md

…

needs_more_info.yml

…

new_release.yml

…