From 66eef8b38412a015912205746b3b8c630648924e Mon Sep 17 00:00:00 2001
From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Date: Sat, 18 Apr 2026 23:30:28 +0000
Subject: [PATCH] fix(ci): remove orphan <<<<<<< HEAD merge-conflict markers in
 ci.yml

A prior merge landed with seven unresolved `<<<<<<< HEAD` lines (each
sitting directly after a `steps:` line) and no matching `=======` /
`>>>>>>>` counterparts, so GitHub Actions (and any other YAML parser)
cannot load the workflow. Removing the orphan markers is a safe no-op
for the intended workflow definition.

Verified the file parses as valid YAML after the change and all seven
jobs (frontend-lint, frontend-type-check, frontend-build, frontend-e2e,
orchestrator-build, contracts-compile, contracts-test) are still defined.

Co-Authored-By: Nakamoto, S <defi@defi-oracle.io>
---
 .github/workflows/ci.yml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4c85fbf..8688376 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -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:
-- 
2.34.1