Stop relabelling PRs with merge conflicts

Alexendoo · Alexendoo · commit 2d119ce5eb7f · 2025-04-02T13:22:10.000Z
diff --git 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]
