Skip to content

Commit

Permalink
Resolve conflicts.
Browse files Browse the repository at this point in the history
  • Loading branch information
pfeairheller committed Dec 7, 2023
1 parent cedbd38 commit 7dac183
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 37 deletions.
73 changes: 37 additions & 36 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"build": "npm run build:cjs && npm run build:esm && npm run build:types",
"test": "jest test/",
"test:integration": "jest examples/integration-scripts/ --runInBand --bail",
"lint": "npx eslint src test examples/integration-scripts examples/scripts",
"lint": "npx eslint src test examples/integration-scripts",
"prepare": "npm run build",
"generate-docs": "node_modules/.bin/jsdoc --configure .jsdoc.json --verbose",
"pretty": "prettier --config .prettierrc 'src/**/*.ts' 'test/**/*.ts' 'examples/**/*.ts' --write",
Expand Down

0 comments on commit 7dac183

Please sign in to comment.