[housekeeping] Automated PR to fix formatting errors on main #32343
+2,518
−2,908
Conversation
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
github-actions
bot
force-pushed
the
housekeeping/fix-codeformatting/main
branch
from
4b761b4 to
b717361
Compare
github-actions
bot
added
area-infrastructure
github-actions
bot
requested review from
jsuarezruiz,
mattleibow and
rmarinho
|
/azp run |
|
Azure Pipelines successfully started running 3 pipeline(s). |
jsuarezruiz
requested changes
Nov 3, 2025
There was a problem hiding this comment.
/Users/builder/azdo/_work/1/s/src/Controls/src/Core/MultiPage.cs(87,1): error CS8300: Merge conflict marker encountered [/Users/builder/azdo/_work/1/s/src/Controls/src/Core/Controls.Core.csproj::TargetFramework=netstandard2.0]
/Users/builder/azdo/_work/1/s/src/Controls/src/Core/MultiPage.cs(92,1): error CS8300: Merge conflict marker encountered [/Users/builder/azdo/_work/1/s/src/Controls/src/Core/Controls.Core.csproj::TargetFramework=netstandard2.0]
/Users/builder/azdo/_work/1/s/src/Controls/src/Core/MultiPage.cs(94,1): error CS8300: Merge conflict marker encountered [/Users/builder/azdo/_work/1/s/src/Controls/src/Core/Controls.Core.csproj::TargetFramework=netstandard2.0]
/Users/builder/azdo/_work/1/s/src/Controls/src/Core/MultiPage.cs(87,1): error CS8300: Merge conflict marker encountered [/Users/builder/azdo/_work/1/s/src/Controls/src/Core/Controls.Core.csproj::TargetFramework=netstandard2.1]
/Users/builder/azdo/_work/1/s/src/Controls/src/Core/MultiPage.cs(92,1): error CS8300: Merge conflict marker encountered [/Users/builder/azdo/_work/1/s/src/Controls/src/Core/Controls.Core.csproj::TargetFramework=netstandard2.1]
/Users/builder/azdo/_work/1/s/src/Controls/src/Core/MultiPage.cs(94,1): error CS8300: Merge conflict marker encountered [/Users/builder/azdo/_work/1/s/src/Controls/src/Core/Controls.Core.csproj::TargetFramework=netstandard2.1]
/Users/builder/azdo/_work/1/s/src/Controls/src/Core/MultiPage.cs(87,1): error CS8300: Merge conflict marker encountered [/Users/builder/azdo/_work/1/s/src/Controls/src/Core/Controls.Core.csproj::TargetFramework=net10.0]
/Users/builder/azdo/_work/1/s/src/Controls/src/Core/MultiPage.cs(92,1): error CS8300: Merge conflict marker encountered [/Users/builder/azdo/_work/1/s/src/Controls/src/Core/Controls.Core.csproj::TargetFramework=net10.0]
/Users/builder/azdo/_work/1/s/src/Controls/src/Core/MultiPage.cs(94,1): error CS8300: Merge conflict marker encountered [/Users/builder/azdo/_work/1/s/src/Controls/src/Core/Controls.Core.csproj::TargetFramework=net10.0]
9 Error(s)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Automated PR to fix formatting errors