Skip to content

SLZ changes to structure file and sync process#1308

Merged
anwather merged 3 commits into
mainfrom
aw/issue1292_v2
May 21, 2026
Merged

SLZ changes to structure file and sync process#1308
anwather merged 3 commits into
mainfrom
aw/issue1292_v2

Conversation

@anwather
Copy link
Copy Markdown
Collaborator

No description provided.

@anwather
Copy link
Copy Markdown
Collaborator Author

@copilot resolve the merge conflicts in this pull request - the main branch had a missing brace exposed as a syntax error. The version in the aw/issue1292_v2 branch is correct.

…on for conflicts

Co-authored-by: anwather <11281622+anwather@users.noreply.github.com>
Copy link
Copy Markdown
Contributor

Copilot AI commented May 21, 2026

@copilot resolve the merge conflicts in this pull request - the main branch had a missing brace exposed as a syntax error. The version in the aw/issue1292_v2 branch is correct.

Merge conflicts resolved in commit 6956440. The aw/issue1292_v2 version is kept for the two conflicting null-check lines in Out-DocumentationForPolicySets.ps1, and the new alz-sync-tests.yml workflow from main is included.

@anwather anwather enabled auto-merge (squash) May 21, 2026 01:08
@anwather anwather merged commit fd59c13 into main May 21, 2026
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants