Closed myf5 closed 4 years ago
有冲突了,需要解决下,可能是一开始你没同步上游分支。
有冲突了,需要解决下,可能是一开始你没同步上游分支。
谢谢,已修复冲突
[APPROVALNOTIFIER] This PR is APPROVED
This pull-request has been approved by: myf5, rootsongjc
The full list of commands accepted by this bot can be found here.
The pull request process is described here
请审校者在合并该 PR 前需要检查以下内容:
当所有以上问题都确定之后,可以由管理者合并 PR 并关闭关联 issue。