Skip to content

Commit

Permalink
fix: git conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
cossssmin committed Jul 15, 2024
1 parent 79727c9 commit fd73020
Show file tree
Hide file tree
Showing 152 changed files with 10,178 additions and 13,189 deletions.
18 changes: 9 additions & 9 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
root = true

[*]
indent_style = space
indent_size = 2
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
root = true

[*]
indent_style = space
indent_size = 2
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
1 change: 0 additions & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,3 @@ updates:
schedule:
interval: "daily"
target-branch: "master"
open-pull-requests-limit: 10
8 changes: 4 additions & 4 deletions .github/workflows/nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ jobs:

strategy:
matrix:
node-version: [14, 16, 18]
node-version: [18, 20, 22]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
- run: npm install
- run: npm ci
- run: npm test
env:
CI: true
Loading

0 comments on commit fd73020

Please sign in to comment.