Skip to content

Commit

Permalink
fix merge conflicts with main
Browse files Browse the repository at this point in the history
  • Loading branch information
MCarlomagno committed Oct 9, 2023
2 parents 158c020 + e19128f commit 479f86d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"nx-build-test-skip-cache": "pnpm run build-test --skip-nx-cache",
"nx-test-skip-cache": "pnpm run test --skip-nx-cache",
"build": "nx run-many -t build --parallel=1",
"build-test": "nx run-many -t style,build,test",
"build-test": "nx run-many -t style,build,test --projects=@openzeppelin/defender-base-client,* --parallel=false",
"lint:check": "eslint 'packages/**/src/**/*.{js,ts}' --quiet",
"lint:fix": "pnpm prettier:fix && pnpm lint:check && pnpm prettier:check",
"prettier:check": "prettier --check '**/*.{js,ts,tsx}'",
Expand Down

0 comments on commit 479f86d

Please sign in to comment.