Fix merge conflicts with 0.52 branch for async changes#53
Fix merge conflicts with 0.52 branch for async changes#53allansson merged 200 commits intomaster-async-browserfrom
Conversation
…g and pull() types by @nwalters512
…I support in Outlook on mobile devices (DefinitelyTyped#69444)
…electron-store by @jakebailey
…wn-it-emoji] update type definitions by @brc-dd
…s for v20.12.2 by @codershiba
… for `password` by @codershiba
…rsions on markdown-it v13 by @brc-dd
…n for users() to bring it up to date for Hubot v11 by @yincrash
… 3 files by @RoboSchmied Signed-off-by: RoboSchmied <[email protected]> Co-authored-by: RoAGmer <[email protected]>
…h, updated Module.instantiateWasm by @mattfysh
… to layout.legend by @marcus-maro
…nctions. by @bmeurer
… VerifyCallback from base @types/passport-oauth2 by @chdanielmueller
…@googlemaps-bot Co-authored-by: copybara-service[bot] <copybara-service[bot]@users.noreply.github.com>
…ler/index.d.ts by @say25
…hChildren type alias for ChunkExtractorManager props by @gbettencourt
…tag from Duplex.from by @10xLaCroixDrinker
…cording to spec update and fixes by @sy-filis
…ay instead of Buffer. by @jaccarmac
|
codershiba seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account. You have signed the CLA already but the status is still pending? Let us recheck it. |
There was a problem hiding this comment.
This is a huge PR but this is the only thing that was changed by me. Other files are due to the 0.52 pulling in the latest version from upstream.
Most of the conflicts were cause between the tap api already being updated to async and the indentation added when wrapping the tests in a function.
|
Apologies to anyone being pinged about signing our CLA. It's my error because of doing a merge commit from master into this branch. You of course don't have to sign anything. |
|
@allansson I've updated my GitHub username from @dr-vortex to @james-pre. Please update your comment(s), and I can delete this one. I'm writing this comment when I can't make the change myself. |
Please fill in this template.
pnpm test <package to test>.release-v0.52.0#50