funky-eyes commented on PR #7480:
URL: https://github.com/apache/incubator-seata/pull/7480#issuecomment-3181876129

   This branch has conflicts that must be resolved
   Use the [web 
editor](https://github.com/apache/incubator-seata/pull/7480/conflicts) or the 
command line to resolve conflicts before continuing.
   
   changes/en-us/2.x.md
   changes/zh-cn/2.x.md


-- 
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