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.

Sign up for GitHub

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

Jump to bottom

Fix a merge conflict that broke the build #12245

Merged
1 commit merged into from
Jan 25, 2022
Merged

Fix a merge conflict that broke the build #12245

1 commit merged into from
Jan 25, 2022

Commits on Jan 25, 2022

  1. Fix a merge conflict that broke the build 

      Less "merge conflict" and more "something that got missed in a merge".
  The offending commits are
  *  68ab807
  *  b3fab51

  The Fuzzer build doesn't run on PR, so it didn't notice this couldn't build.
    @zadjii-msft
    zadjii-msft committed Jan 25, 2022
    Configuration menu
    Copy the full SHA
    8977e05 View commit details
    Browse the repository at this point in the history