Skip to content

Merge main to feature/flat_map#5052

Merged
StephanTLavavej merged 15 commits intomicrosoft:feature/flat_mapfrom
StephanTLavavej:merge-flat_map
Oct 28, 2024
Merged

Merge main to feature/flat_map#5052
StephanTLavavej merged 15 commits intomicrosoft:feature/flat_mapfrom
StephanTLavavej:merge-flat_map

Conversation

@StephanTLavavej
Copy link
Member

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

Resolved adjacent-add conflict in stl.natvis.

@StephanTLavavej StephanTLavavej added uncharted Excluded from the Status Chart flat_meow C++23 container adaptors labels Oct 28, 2024
@StephanTLavavej StephanTLavavej requested a review from a team as a code owner October 28, 2024 21:06
@CaseyCarter

This comment was marked as resolved.

@StephanTLavavej StephanTLavavej merged commit c819e49 into microsoft:feature/flat_map Oct 28, 2024
@StephanTLavavej StephanTLavavej deleted the merge-flat_map branch October 28, 2024 21:56
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.

6 participants