Add merge-conflict label

2017-09-08 11:58:36 -07:00 · 2017-09-08 11:58:36 -07:00 · c61f694532
parent b9c9c90c93
commit c61f694532
1 changed files with 1 additions and 0 deletions
--- a/.github/classifier.yml
+++ b/.github/classifier.yml
@ -34,6 +34,7 @@
        json: [],
        languages basic: [],
        markdown: [],
+        merge-conflict: [ chrmarti ],
        perf-profile: [],
        php: [ roblourens ],
        search: [ roblourens ],