From 08eb33ed282747d904cfcf0e7dd4ad4ccbac92d5 Mon Sep 17 00:00:00 2001 From: CrimsonTome Date: Sat, 17 Sep 2022 03:18:52 +0100 Subject: [PATCH] fix merge conflicts --- .github/workflows/node CI.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/node CI.yml b/.github/workflows/node CI.yml index 29e9fcb..b13c00f 100644 --- a/.github/workflows/node CI.yml +++ b/.github/workflows/node CI.yml @@ -6,9 +6,9 @@ name: CI on: # Triggers the workflow on push or pull request events but only for the "main" branch push: - branches: [ "main" ] + branches: ["main"] pull_request: - branches: [ "main" ] + branches: ["main"] # Allows you to run this workflow manually from the Actions tab workflow_dispatch: @@ -24,10 +24,16 @@ jobs: steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - uses: actions/checkout@v3 - + - name: Use Node.js uses: actions/setup-node@v1 with: +<<<<<<< HEAD node-version: '18.x' + - name: run Prettier + run: npx prettier --check . +======= + node-version: "18.x" +>>>>>>> 229a8cf (format all with prettier) - name: Run npm run: npm install && npm run build