Repository navigation
Remove leftover merge conflict markers from codespace document - #38
Merged
Merged
Conversation
mschoettle
changed the title
Contributor
Author
|
Ping @MasonEgger @tomwheeler |
Contributor
CC'ing @angelazhou32, since neither Mason nor I are part of the Education team and therefore no longer have write permissions to this repo. Angela does, and should be able to take care of this. |
angelazhou32
approved these changes
Oct 5, 2026
Contributor
|
Thanks for the fix @mschoettle , and thanks for the ping @tomwheeler. Approving and merging! |
angelazhou32
approved these changes
Oct 5, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What was changed
Noticed a merge conflict marker in
codespaces.mdand resolved it.Why?
Shows up in the rendered document.
Checklist
Closes
How was this tested: