Skip to content

Remove CI conflict markers#254

Open
93jun wants to merge 1 commit into
geerlingguy:masterfrom
93jun:fix-ci-conflict-markers
Open

Remove CI conflict markers#254
93jun wants to merge 1 commit into
geerlingguy:masterfrom
93jun:fix-ci-conflict-markers

Conversation

@93jun

@93jun 93jun commented Jul 6, 2026

Copy link
Copy Markdown

Summary

Removes leftover Git conflict markers from the GitHub Actions CI workflow matrix.

Details

The current workflow file contains unresolved conflict marker lines around the Molecule matrix. Those markers make the workflow YAML invalid for GitHub Actions.

This change keeps the current active matrix entries and only removes the conflict-marker block.

Validation

  • Parsed .github/workflows/ci.yml with PyYAML successfully.
  • Confirmed no <<<<<<<, =======, or >>>>>>> markers remain in the workflow file.

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.

1 participant