Commit 10de8b0
fix(ci): resolve leftover merge-conflict markers in 3 files
.github/workflows/instant-sync.yml, .github/workflows/semgrep.yml, and
.github/FUNDING.yml all had unresolved <<<<<<< HEAD / ======= / >>>>>>>
markers committed straight to main from a prior "sync from parent repo
automation" merge. In all three cases both sides of the conflict were
identical (a duplicated SPDX header line) — collapsed to one copy.
A file with literal conflict markers isn't valid YAML, so CI (including
CodeQL's "actions" language analysis) has been failing on every PR
against this repo regardless of the PR's own diff, since the problem
lives in the base branch, not any individual PR.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>1 parent 2e74cb6 commit 10de8b0
3 files changed
Lines changed: 0 additions & 12 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
2 | 1 | | |
3 | | - | |
4 | | - | |
5 | | - | |
6 | 2 | | |
7 | 3 | | |
8 | 4 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
2 | 1 | | |
3 | | - | |
4 | | - | |
5 | | - | |
6 | 2 | | |
7 | 3 | | |
8 | 4 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
2 | 1 | | |
3 | | - | |
4 | | - | |
5 | | - | |
6 | 2 | | |
7 | 3 | | |
8 | 4 | | |
| |||
0 commit comments