funky-eyes commented on code in PR #6310:
URL: https://github.com/apache/incubator-seata/pull/6310#discussion_r1466435690


##########
changes/zh-cn/2.x.md:
##########
@@ -72,7 +72,10 @@
 - [[#6294](https://github.com/apache/incubator-seata/pull/6294)] 
拆分前端资源打包流程到单独的profile
 - [[#6297](https://github.com/apache/incubator-seata/pull/6297)] 修复 
`maven-pmd-plugin` 相关的问题
 - [[#6298](https://github.com/apache/incubator-seata/pull/6298)] 重命名包名为 
org.apache.seata
+<<<<<<< HEAD
+=======
 - [[#6304](https://github.com/apache/incubator-seata/pull/6304)] 禁用 OSSRH 发布工作流
+>>>>>>> 5412202ee622104c925b5e26c35193062e7f09a7

Review Comment:
   ```suggestion
   <<<<<<< HEAD
   - [[#6304](https://github.com/apache/incubator-seata/pull/6304)] 禁用 OSSRH 
发布工作流
   - [[#6310](https://github.com/apache/incubator-seata/pull/6310)] 
seata-server兼容io.seata包
   
   ```



##########
changes/en-us/2.x.md:
##########
@@ -74,7 +74,10 @@ Add changes here for all PR submitted to the 2.x branch.
 - [[#6294](https://github.com/apache/incubator-seata/pull/6294)] split the 
frontend resource build process into separate profiles
 - [[#6297](https://github.com/apache/incubator-seata/pull/6297)] fix problem 
of `maven-pmd-plugin`
 - [[#6298](https://github.com/apache/incubator-seata/pull/6298)] repackage 
name to org.apache.seata
+<<<<<<< HEAD
+=======
 - [[#6304](https://github.com/apache/incubator-seata/pull/6304)] disable 
Publish OSSRH workflow
+>>>>>>> 5412202ee622104c925b5e26c35193062e7f09a7

Review Comment:
   ```suggestion
   <<<<<<< HEAD
   - [[#6304](https://github.com/apache/incubator-seata/pull/6304)] disable 
Publish OSSRH workflow
   - [[#6310](https://github.com/apache/incubator-seata/pull/6310)] 
seata-server compatible io.seata package
   
   ```



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: [email protected]

For queries about this service, please contact Infrastructure at:
[email protected]


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to