Skip to content

fixed teamwork version#4130

Merged
cjihrig merged 3 commits intohapijs:masterfrom
irshad437:master
Aug 11, 2020
Merged

fixed teamwork version#4130
cjihrig merged 3 commits intohapijs:masterfrom
irshad437:master

Conversation

@irshad437
Copy link
Copy Markdown
Contributor

This was using a deprecated version of teamwork which was leaving it unable to use. I've updated the version.

@cjihrig
Copy link
Copy Markdown
Contributor

cjihrig commented Aug 10, 2020

@irshad437 sorry, but this has a conflict. Would you mind resolving that so that your change can land and be released in hapi v20?

@irshad437
Copy link
Copy Markdown
Contributor Author

Hi @cjihrig , I had resolved the conflicts but the build fails. I am unable to understand the reason. Could you please help me here?

@kanongil
Copy link
Copy Markdown
Contributor

It seems to be unrelated, as a restart of the test https://travis-ci.org/github/hapijs/hapi/jobs/716867430 cleared the issue.

@cjihrig cjihrig merged commit 501a264 into hapijs:master Aug 11, 2020
@cjihrig
Copy link
Copy Markdown
Contributor

cjihrig commented Aug 11, 2020

Thanks for the contribution!

@cjihrig cjihrig added this to the 20.0.0 milestone Aug 11, 2020
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.

4 participants