Skip to content

Commit c983fa4

Browse files
committed
cleans up merge conflict in package.json
2 parents b3eef6c + ae7046a commit c983fa4

File tree

4 files changed

+24
-16
lines changed

4 files changed

+24
-16
lines changed

.github/dependabot.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: npm
4+
directory: "/"
5+
schedule:
6+
interval: daily
7+
time: "03:00"
8+
open-pull-requests-limit: 10

.github/workflows/coveralls.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515

1616
strategy:
1717
matrix:
18-
node-version: [12.x]
18+
node-version: [10.x, 12.x, 14.x]
1919

2020
steps:
2121
- name: Get npm cache directory

package-lock.json

Lines changed: 12 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@
2929
"README.md"
3030
],
3131
"dependencies": {
32-
"chalk": "^4.0.0",
32+
"chalk": "^4.1.0",
3333
"compare-versions": "^3.6.0",
3434
"elapsed-time-logger": "^1.1.2",
35-
"fast-glob": "^3.2.2",
36-
"fs-extra": "^9.0.0",
35+
"fast-glob": "^3.2.4",
36+
"fs-extra": "^9.0.1",
3737
"fuzzy": "^0.1.3",
3838
"ora": "^4.0.4",
3939
"pacote": "^11.1.10",

0 commit comments

Comments
 (0)