try manual rebase conflict fix

2022-06-10 12:21:48 +12:00 · 2022-06-10 12:21:48 +12:00 · 5054105972
parent ce796e1cd7
commit 5054105972
2 changed files with 1100 additions and 6094 deletions
--- a/plugins/woocommerce-beta-tester/package.json
+++ b/plugins/woocommerce-beta-tester/package.json
@ -38,6 +38,7 @@
 	},
 	"scripts": {
 		"postinstall": "composer install",
+		"changelog": "composer exec -- changelogger",
 		"build": "pnpm run build:admin && pnpm run uglify",
 		"build:admin": "wp-scripts build",
 		"build:zip": "./bin/build-zip.sh",
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml