Stream: git-wasmtime

Topic: wasmtime / PR #3378 Fix a merge conflict on `main`

Wasmtime GitHub notifications bot (Sep 21 2021 at 19:45):

alexcrichton opened PR #3378 from fix-ci to main:

This commit fixes a "merge conflict" with #3319 being merged into
main, causing CI failures on merge.

<!--

Please ensure that the following steps are all taken care of before submitting
the PR.

• [ ] This has been discussed in issue #..., or if not, please tell us why
  here.

• [ ] A short description of what this does, why it is needed; if the
  description becomes long, the matter should probably be discussed in an issue
  first.

• [ ] This PR contains test cases, if meaningful.

• [ ] A reviewer from the core maintainer team has been assigned for this PR.
  If you don't know who could review this, please indicate so. The list of
  suggested reviewers on the right can help you.

Please ensure all communication adheres to the code of conduct.
-->

Wasmtime GitHub notifications bot (Sep 21 2021 at 19:45):

alexcrichton requested peterhuene for a review on PR #3378.

Wasmtime GitHub notifications bot (Sep 21 2021 at 19:47):

peterhuene submitted PR review.

Wasmtime GitHub notifications bot (Sep 21 2021 at 20:30):

alexcrichton merged PR #3378.

Last updated: Dec 23 2024 at 12:05 UTC