From c61f694532b64a9a50b9685c1d498c2e4ad7cf88 Mon Sep 17 00:00:00 2001
From: Christof Marti <chrmarti@microsoft.com>
Date: Fri, 8 Sep 2017 11:58:36 -0700
Subject: [PATCH] Add merge-conflict label

---
 .github/classifier.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/classifier.yml b/.github/classifier.yml
index b3199eb0752..d3ea84c3705 100644
--- 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 ],