From 1cdf31685292e78a8750fe7e7ab724239b0d3d60 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Fri, 25 Jun 2021 18:33:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E8=AF=B7=E6=B1=82=EF=BC=9A?=
 =?UTF-8?q?=E5=86=B2=E7=AA=81=E6=96=87=E4=BB=B6=E7=9A=84=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E6=8D=A2=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Merge/MessageCount.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/forge/Merge/MessageCount.js b/src/forge/Merge/MessageCount.js
index 61a9a9a4b..c7a96468c 100644
--- a/src/forge/Merge/MessageCount.js
+++ b/src/forge/Merge/MessageCount.js
@@ -280,7 +280,7 @@ class MessageCount extends Component {
             <p>
               {
                 conflict_files.map((i,k)=>{
-                  return k>0 ? "，"+i : i
+                  return <p>{i}</p>
                 })
               }
             </p>