d-bis/CurrenciCombo
4
0
Fork 0
Code Issues Pull Requests 4 Actions Packages Projects Releases Wiki Activity

fix(ci): remove orphan <<<<<<< HEAD merge-conflict markers in ci.yml #1

Open
nsatoshi wants to merge 1 commits from devin/1776555011-fix-ci-conflict-markers into main
pull from: devin/1776555011-fix-ci-conflict-markers
merge into: d-bis:main
Conversation 0 Commits 1 Files Changed 1 -7
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.github/workflows/ci.yml vendored
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: