Skip to content

Conversation

@StephanTLavavej
Copy link
Member

Picks up #1399.

Merge conflict in tests/std/test.lst because tests\P1502R1_standard_library_header_units was added next to tests\P1614R2_spaceship. Took both changes and sorted them.

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

StephanTLavavej and others added 6 commits October 23, 2020 00:13
@StephanTLavavej StephanTLavavej added infrastructure Related to repository automation uncharted Excluded from the Status Chart labels Oct 27, 2020
@StephanTLavavej StephanTLavavej requested a review from a team as a code owner October 27, 2020 01:59
@StephanTLavavej StephanTLavavej merged commit 24fbe3b into microsoft:feature/spaceship Oct 27, 2020
@StephanTLavavej StephanTLavavej deleted the merge_spaceship branch October 27, 2020 06:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

infrastructure Related to repository automation uncharted Excluded from the Status Chart

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants