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.

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

Fix merge compile issues #3198

Merged
merged 1 commit into from
Nov 9, 2022
Merged

Conversation

cwfitzgerald
Copy link
Member

Checklist

  • Run cargo clippy.
  • Run RUSTFLAGS=--cfg=web_sys_unstable_apis cargo clippy --target wasm32-unknown-unknown if applicable.
  • Add change to CHANGELOG.md. See simple instructions inside file.

Connections

#3178 plus some merge conflicts lead to a fun time

@cwfitzgerald cwfitzgerald enabled auto-merge (squash) November 9, 2022 21:38
@cwfitzgerald cwfitzgerald merged commit d536613 into gfx-rs:master Nov 9, 2022
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.

1 participant