Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Conversation

@tannergooding
Copy link
Member

This was already approved and merged in #36662.

However, it was immediately reverted (likely by accident) in #36656 as part of a merge conflict resolution.

I plan on merging as soon as CI passes.

CC. @safern, @stephentoub as an FYI.

Copy link
Member

@safern safern left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM -- the drawing test crashes is a known issue... https://github.com/dotnet/corefx/issues/36683

@ahsonkhan
Copy link

However, it was immediately reverted (likely by accident) in #36656 as part of a merge conflict resolution.

Was that the only issue with the merge?
https://github.com/dotnet/corefx/pull/36656/files#diff-8b8f08ffbf7b863fb3700c1718eeb4cbR39

cc @Anipik

@tannergooding tannergooding merged commit 7bc5200 into dotnet:master Apr 8, 2019
@karelz karelz added this to the 3.0 milestone May 22, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants