From a39233c6ff51e5a1f4dc7d980fc196a4148af8c2 Mon Sep 17 00:00:00 2001
From: wrexbe <81056464+wrexbe@users.noreply.github.com>
Date: Mon, 13 Jun 2022 08:03:00 -0700
Subject: [PATCH] Remove merge conflict comment (#8819)

---
 .github/workflows/conflict-labeler.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/conflict-labeler.yml b/.github/workflows/conflict-labeler.yml
index fd832b9231..68666aa755 100644
--- a/.github/workflows/conflict-labeler.yml
+++ b/.github/workflows/conflict-labeler.yml
@@ -15,4 +15,3 @@ jobs:
         with:
           dirtyLabel: "Merge Conflict"
           repoToken: "${{ secrets.GITHUB_TOKEN }}"
-          commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request."