Skip to content

Commit

Permalink
fix merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
ddelgrosso1 committed Sep 29, 2023
1 parent e73b5dc commit bb5fb0c
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,10 @@
"predocs-test": "npm run docs",
"predocs": "npm run compile:cjs -- --sourceMap",
"prelint": "cd samples; npm link ../; npm install",
"prepare": "npm run compile:cjs",
"prepare": "npm run compile",
"presystem-test:esm": "npm run compile:esm",
"presystem-test": "npm run compile:cjs -- --sourceMap",
"pretest": "npm run compile:cjs -- --sourceMap",
"presystem-test": "npm run compile -- --sourceMap",
"pretest": "npm run compile -- --sourceMap",
"samples-test": "npm link && cd samples/ && npm link ../ && npm test && cd ../",
"system-test:esm": "mocha build/esm/system-test --timeout 600000 --exit",
"system-test": "mocha build/cjs/system-test --timeout 600000 --exit",
Expand Down

0 comments on commit bb5fb0c

Please sign in to comment.