fix(ci): remove orphan <<<<<<< HEAD merge-conflict markers in ci.yml (#1)
Some checks failed
CI / Frontend Lint (push) Has been cancelled
CI / Frontend Type Check (push) Has been cancelled
CI / Frontend Build (push) Has been cancelled
CI / Frontend E2E Tests (push) Has been cancelled
CI / Orchestrator Build (push) Has been cancelled
CI / Contracts Compile (push) Has been cancelled
CI / Contracts Test (push) Has been cancelled
Security Scan / Dependency Vulnerability Scan (push) Failing after 8s
Security Scan / OWASP ZAP Scan (push) Has been cancelled

This commit was merged in pull request #1.
This commit is contained in:
2026-04-22 17:11:21 +00:00
parent b118b2be9c
commit 5ea631ad2f

View File

@@ -12,7 +12,6 @@ jobs:
name: Frontend Lint
runs-on: ubuntu-latest
steps:
<<<<<<< HEAD
- uses: actions/checkout@v5
- uses: actions/setup-node@v6
with:
@@ -30,7 +29,6 @@ jobs:
name: Frontend Type Check
runs-on: ubuntu-latest
steps:
<<<<<<< HEAD
- uses: actions/checkout@v5
- uses: actions/setup-node@v6
with:
@@ -48,7 +46,6 @@ jobs:
name: Frontend Build
runs-on: ubuntu-latest
steps:
<<<<<<< HEAD
- uses: actions/checkout@v5
- uses: actions/setup-node@v6
with:
@@ -71,7 +68,6 @@ jobs:
name: Frontend E2E Tests
runs-on: ubuntu-latest
steps:
<<<<<<< HEAD
- uses: actions/checkout@v5
- uses: actions/setup-node@v6
with:
@@ -99,7 +95,6 @@ jobs:
name: Orchestrator Build
runs-on: ubuntu-latest
steps:
<<<<<<< HEAD
- uses: actions/checkout@v5
- uses: actions/setup-node@v6
with:
@@ -118,7 +113,6 @@ jobs:
name: Contracts Compile
runs-on: ubuntu-latest
steps:
<<<<<<< HEAD
- uses: actions/checkout@v5
- uses: actions/setup-node@v6
with:
@@ -136,7 +130,6 @@ jobs:
name: Contracts Test
runs-on: ubuntu-latest
steps:
<<<<<<< HEAD
- uses: actions/checkout@v5
- uses: actions/setup-node@v6
with: