Merge branch 'develop'

2021-06-25 18:34:19 +08:00 · 2021-06-25 18:34:19 +08:00 · db682ace86
parent 777dbd0f43 1cdf316852
commit db682ace86
1 changed files with 1 additions and 1 deletions
--- 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>