Skip to content

Commit 10abd31

Browse files
fix: resolving merge conflicts
1 parent 1418a39 commit 10abd31

4 files changed

Lines changed: 3 additions & 160 deletions

File tree

automation/scripts/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
"lint:enableme": "eslint . --ext .mjs",
1616
"root-script:commitlint": "commitlint",
1717
"root-script:format-staged": "pretty-quick --staged --config \"./.prettierrc.cjs\" --pattern \"**/{src,script,typings,test,**}/**/*.{cjs,mjs,js,jsx,ts,tsx,scss,xml,md,json}\"",
18-
"update-screenshots": "node update-screenshots.mjs"
18+
"update-screenshots": "node update-screenshots.mjs",
19+
"update-screenshots-local": "node update-screenshots-local.mjs"
1920
},
2021
"dependencies": {
2122
"@commitlint/cli": "^19.8.1",

automation/utils/bin/rui-merge-changelogs-pr.ts

100644100755
File mode changed.

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
"release": "turbo run release",
2323
"test": "turbo run test --continue --concurrency 1",
2424
"update-screenshots": "node automation/scripts/update-screenshots.mjs",
25+
"update-screenshots-local": "node automation/scripts/update-screenshots-local.mjs",
2526
"verify": "turbo run verify --continue --concurrency 1"
2627
},
2728
"devDependencies": {

0 commit comments

Comments
 (0)