Skip to content

Commit

Permalink
fix: resolve package.json merge conflicts
Browse files Browse the repository at this point in the history
Co-Authored-By: Michael Latman <[email protected]>
  • Loading branch information
devin-ai-integration[bot] and michaellatman committed Dec 11, 2024
1 parent 6589f39 commit 74c83dd
Showing 1 changed file with 0 additions and 9 deletions.
9 changes: 0 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,9 @@
"scripts": {
"build": "tsc && chmod +x dist/index.js",
"start": "node dist/index.js",
<<<<<<< HEAD
||||||| parent of 160669b (ci: add GitHub Actions workflow for running tests)
"test": "jest",
"test:watch": "jest --watch",
"test:coverage": "jest --coverage",
=======
"test": "jest --coverage",
"test:watch": "jest --watch",
"test:coverage": "jest --coverage",
>>>>>>> 160669b (ci: add GitHub Actions workflow for running tests)
"test:list": "node --loader ts-node/esm src/index.ts list",
"test:install": "node --loader ts-node/esm src/index.ts install",
"test:installed": "node --loader ts-node/esm src/index.ts installed",
Expand All @@ -26,8 +19,6 @@
"version:major": "npm version major",
"publish:npm": "npm run build && npm publish --access public",
"pr-check": "node src/scripts/pr-check.js",
"test:watch": "NODE_OPTIONS=--experimental-vm-modules jest --config jest.config.mjs --watch",
"test:coverage": "NODE_OPTIONS=--experimental-vm-modules jest --config jest.config.mjs --coverage",
"prepare": "npm run build"
},
"bin": {
Expand Down

0 comments on commit 74c83dd

Please sign in to comment.