fix(git): resolve conflicts

nwjs · Jul 27, 2024 · dabe54f · dabe54f
2 parents 5055d49 + 32eb170
commit dabe54f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 226 deletions.
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -24,7 +24,7 @@ jobs:
       - name: Get Node version from Node manifest
         run: echo "NODE_VER=$(curl -s https://nwjs.io/versions | jq -r ".versions[0].components.node")" >> $GITHUB_ENV
       - name: Setup Node
-        uses: actions/[email protected].2
+        uses: actions/[email protected].3
         with:
           node-version: ${{ env.NODE_VER }}
           cache: "npm"

diff --git a/.github/workflows/npm.yml b/.github/workflows/npm.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/[email protected]
-      - uses: actions/[email protected].2
+      - uses: actions/[email protected].3
         with:
           node-version: 22
           cache: "npm"

diff --git a/package-lock.json b/package-lock.json