From 2d119ce5eb7f041e298ab744b4e5d569461b0119 Mon Sep 17 00:00:00 2001
From: Alex Macleod <alex@macleod.io>
Date: Wed, 2 Apr 2025 13:22:10 +0000
Subject: [PATCH] Stop relabelling PRs with merge conflicts

---
 triagebot.toml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/triagebot.toml b/triagebot.toml
index 737aaec79a0d..a82fb00c0e9d 100644
--- a/triagebot.toml
+++ b/triagebot.toml
@@ -10,9 +10,6 @@ allow-unauthenticated = [
 [shortcut]
 
 [merge-conflicts]
-add = ['S-waiting-on-author']
-remove = ['S-waiting-on-review']
-unless = ['S-blocked', 'S-final-comment-period']
 
 # Have rustbot inform users about the *No Merge Policy*
 [no-merges]