Skip to content

Conversation

@yanguoyu
Copy link
Contributor

Merge master to dev to resolve the conflict

@yanguoyu
Copy link
Contributor Author

@Keith-CY @homura @devchenyan please have a review

@homura
Copy link
Contributor

homura commented Mar 14, 2024

any reason for deleting conenctor.test.ts?

@yanguoyu
Copy link
Contributor Author

any reason for deleting conenctor.test.ts?

Because it has been renamed to full-synchronizer.test.ts, merge master has no conflict with it.

@Keith-CY Keith-CY merged commit b3ea53e into nervosnetwork:develop Mar 14, 2024
@yanguoyu yanguoyu deleted the merge-master-to-dev branch March 14, 2024 23:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants