Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(test): First 11 cellbases have not outputs #1684

Merged
merged 1 commit into from
Oct 9, 2019

Conversation

keroro520
Copy link
Contributor

@keroro520 keroro520 commented Oct 9, 2019

#1605 did not correctly resolve conflict before merging. Hence it breaks CI for develop-branch. Here comes this PR to fix it.

@keroro520 keroro520 requested a review from a team October 9, 2019 00:56
@keroro520
Copy link
Contributor Author

make integration passed locally.

@u2
Copy link
Contributor

u2 commented Oct 9, 2019

bors r=quake,u2

@nervos-bot nervos-bot bot added the s:ready-to-merge Status: Waiting to be merged. label Oct 9, 2019
bors bot added a commit that referenced this pull request Oct 9, 2019
1684: fix(test): First 11 cellbases have not outputs r=quake,u2 a=keroro520

#1605 did not correctly resolve conflict before merging. Hence it breaks CI for develop-branch. Here comes this PR to fix it.

Co-authored-by: keroro520 <[email protected]>
@u2
Copy link
Contributor

u2 commented Oct 9, 2019

bors ping

@bors
Copy link
Contributor

bors bot commented Oct 9, 2019

pong

@u2
Copy link
Contributor

u2 commented Oct 9, 2019

bors r=quake,u2

@bors
Copy link
Contributor

bors bot commented Oct 9, 2019

Already running a review

@u2
Copy link
Contributor

u2 commented Oct 9, 2019

bors r-

@bors
Copy link
Contributor

bors bot commented Oct 9, 2019

Canceled

@u2
Copy link
Contributor

u2 commented Oct 9, 2019

bors r=quake,u2

bors bot added a commit that referenced this pull request Oct 9, 2019
1684: fix(test): First 11 cellbases have not outputs r=quake,u2 a=keroro520

#1605 did not correctly resolve conflict before merging. Hence it breaks CI for develop-branch. Here comes this PR to fix it.

Co-authored-by: keroro520 <[email protected]>
@bors
Copy link
Contributor

bors bot commented Oct 9, 2019

Build succeeded

  • continuous-integration/travis-ci/push

@bors bors bot merged commit b28f401 into nervosnetwork:develop Oct 9, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
s:ready-to-merge Status: Waiting to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants