Repository navigation
fix(win): remove stray merge separator lines from partials.psm1 - #249
Merged
Merged
Conversation
This was referenced Oct 14, 2026
This was referenced Oct 28, 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
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.
Removes two leftover
=======lines inwin/partials.psm1introduced while reconciling #247 and #248. PowerShell runs a bare=======as a command, so the first one cut the cmake argument list short and the Windows build on main failed with-DGDAL_USE_MYSQL=ON: The term is not recognized.Verification: no conflict markers remain in the repository (
git grepfor<<<<<<<,=======,>>>>>>>line starts); the diff is exactly the two deleted lines.