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

Merge main to feature/flat_set #3947

Merged

Conversation

StephanTLavavej
Copy link
Member

Trivial merge conflict in yvals_core.h around the feature-test macro.

⚠️ Commit as a merge, not as a squash!

infdahai and others added 30 commits July 20, 2023 16:32
Co-authored-by: Nicole Mazzuca <[email protected]>
Co-authored-by: Stephan T. Lavavej <[email protected]>
Co-authored-by: Stephan T. Lavavej <[email protected]>
Co-authored-by: Casey Carter <[email protected]>
)

Co-authored-by: Stephan T. Lavavej <[email protected]>
Co-authored-by: Michael Schellenberger Costa <[email protected]>
@StephanTLavavej StephanTLavavej added uncharted Excluded from the Status Chart flat_meow C++23 container adaptors labels Aug 11, 2023
@StephanTLavavej StephanTLavavej requested a review from a team as a code owner August 11, 2023 04:05
@StephanTLavavej StephanTLavavej merged commit d6e6b5a into microsoft:feature/flat_set Aug 11, 2023
37 checks passed
@StephanTLavavej StephanTLavavej deleted the merge-flat_set branch August 11, 2023 05:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
flat_meow C++23 container adaptors uncharted Excluded from the Status Chart
Projects
None yet
Development

Successfully merging this pull request may close these issues.