Add merge-conflict label

mustafa-95 · Sep 8, 2017 · c61f694 · c61f694
1 parent b9c9c90
commit c61f694
Showing 1 changed file with 1 addition and 0 deletions.
diff --git 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 ],