File tree Expand file tree Collapse file tree 2 files changed +6
-6
lines changed Expand file tree Collapse file tree 2 files changed +6
-6
lines changed Original file line number Diff line number Diff line change 5
5
* text =auto eol =lf
6
6
7
7
# Ignore differences on NPM's lockfile.
8
- # Since version 5.7.0, NPM automatically handle merge conflicts.
8
+ # Since version 5.7.0, NPM automatically handles merge conflicts.
9
9
package-lock.json - diff
Original file line number Diff line number Diff line change @@ -12,19 +12,19 @@ node_modules/
12
12
npm-shrinkwrap.json
13
13
14
14
# Yarn's lockfile, Plug'n'Play, folder and settings.
15
- # We're using NPM and it provide its own lockfile and settings.
15
+ # We're using npm, and it provides its lockfile and settings.
16
16
yarn.lock
17
17
.pnp. *
18
18
.yarn /
19
19
.yarnrc
20
20
.yarnrc.yaml
21
21
22
- # PNPM 's lockfile, workspaces and hooks.
23
- # We're using NPM and it provide its own lockfile and settings.
22
+ # pnpm 's lockfile, workspace definitions and hooks.
23
+ # We're using npm, and it provides its lockfile and settings.
24
24
pnpm-lock.yaml
25
- pnpm-workspaces .yaml
25
+ pnpm-workspace .yaml
26
26
pnpmfile.js
27
27
28
- # Log's files.
28
+ # Log files.
29
29
* .log
30
30
* .log. *
You can’t perform that action at this time.
0 commit comments