Skip to content

Fix build break after merge conflict#1245

Merged
joperezr merged 3 commits intomicrosoft:mainfrom
tlmii:dev/fix-build-break
Dec 6, 2023
Merged

Fix build break after merge conflict#1245
joperezr merged 3 commits intomicrosoft:mainfrom
tlmii:dev/fix-build-break

Conversation

@tlmii
Copy link
Copy Markdown
Member

@tlmii tlmii commented Dec 6, 2023

When I merged #1231 I didn't realize that #1229 was merged a couple hours before and it removed SelectedResourceName in favor of SelectedResource. Small fix to use SelectedResource instead.

@joperezr joperezr enabled auto-merge (squash) December 6, 2023 17:43
@joperezr
Copy link
Copy Markdown
Member

joperezr commented Dec 6, 2023

The code coverage break we are getting is unrelated to the break you are fixing here @tlmii, would you mind if I push a change here to fix that other code coverage break too?

@tlmii
Copy link
Copy Markdown
Member Author

tlmii commented Dec 6, 2023

Nope, go ahead.

@joperezr joperezr force-pushed the dev/fix-build-break branch from 8eb3b42 to b40cc5a Compare December 6, 2023 18:23
Copy link
Copy Markdown
Member

@eerhardt eerhardt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@joperezr joperezr merged commit 9d2eb43 into microsoft:main Dec 6, 2023
@github-actions github-actions Bot locked and limited conversation to collaborators Apr 27, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants