From cb6d77e6fe28a94d65ad024dd91af8f6f343d8a2 Mon Sep 17 00:00:00 2001
From: btea <2356281422@qq.com>
Date: Tue, 11 Nov 2025 11:04:57 +0800
Subject: [PATCH] ci: fix pr-conflict action (#22730)

---
 .github/workflows/pr-conflict.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/workflows/pr-conflict.yml b/.github/workflows/pr-conflict.yml
index d250c701fc..5442b87328 100644
--- a/.github/workflows/pr-conflict.yml
+++ b/.github/workflows/pr-conflict.yml
@@ -10,11 +10,8 @@ jobs:
     steps:
       - name: Check for specific label
         if: contains(github.event.pull_request.labels.*.name, 'conflict pending')
-        uses: actions-cool/maintain-one-comment@v3.1.1
+        uses: actions-cool/maintain-one-comment@v3.2.0
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           body: |
             @${{ github.event.pull_request.user.login }} This PR has conflicts, please resolve them.
-            <!-- ELEMENT_PLUS_CONFLICT_COMMENT -->
-          body-include: '<!-- ELEMENT_PLUS_CONFLICT_COMMENT -->'
-          number: ${{ github.event.pull_request.number }}