Skip to content

Commit 1a1e18c

Browse files
fix: merge conflicts
1 parent 74c72f6 commit 1a1e18c

File tree

2 files changed

+189
-2
lines changed

2 files changed

+189
-2
lines changed

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,14 @@
1212
"oss-clearance": "pnpm --filter @mendix/automation-utils run oss-clearance",
1313
"create-gh-release": "turbo run create-gh-release --concurrency 1",
1414
"create-translation": "turbo run create-translation",
15-
"postinstall": "turbo run agent-rules",
1615
"lint": "turbo run lint --continue --concurrency 1",
1716
"prepare": "husky install",
1817
"prepare-release": "pnpm --filter @mendix/automation-utils run prepare-release",
1918
"publish-marketplace": "turbo run publish-marketplace",
2019
"release": "turbo run release",
2120
"test": "turbo run test --continue --concurrency 1",
2221
"verify": "turbo run verify --continue --concurrency 1",
23-
"version": "pnpm --filter @mendix/automation-utils run version"
22+
"version": "pnpm --filter @mendix/automation-utils run version",
2423
"update-screenshots": "pnpm --filter @mendix/automation-utils run update-screenshots",
2524
"postinstall": "turbo run agent-rules"
2625
},

0 commit comments

Comments
 (0)