Fix error that occurred when resolving a merge conflict. by sean-mcmanus · Pull Request #9424 · microsoft/vscode-cpptools · GitHub
Skip to content

Fix error that occurred when resolving a merge conflict.#9424

Merged
sean-mcmanus merged 1 commit into
releasefrom
seanmcm/fixReleaseMerge
Jun 8, 2022
Merged

Fix error that occurred when resolving a merge conflict.#9424
sean-mcmanus merged 1 commit into
releasefrom
seanmcm/fixReleaseMerge

Conversation

@sean-mcmanus

Copy link
Copy Markdown
Contributor

No description provided.

@sean-mcmanus sean-mcmanus requested a review from a team June 8, 2022 17:43
@sean-mcmanus sean-mcmanus merged commit 872c86a into release Jun 8, 2022
@sean-mcmanus sean-mcmanus deleted the seanmcm/fixReleaseMerge branch June 8, 2022 17:47
@github-actions github-actions Bot locked and limited conversation to collaborators Jul 24, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants