add conflict kodiak label

waldronmatt · Jan 5, 2024 · bf9bd9b · bf9bd9b
1 parent 5594301
commit bf9bd9b
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/.github/labels.yml b/.github/labels.yml
@@ -83,3 +83,6 @@
 - name: "wip"
   color: 000000
   description: "Work In Progress - Do not merge (kodiak blocking label)"
+- name: "conflict"
+  color: B60205
+  description: "Address merge conflicts (kodiak autoupdate label)"