Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/325100
Change subject: Fix merge_strategy since it requires _ in manifest version 1 ...................................................................... Fix merge_strategy since it requires _ in manifest version 1 Change-Id: I4211e36598db95c62806a269b90403d4f7b578c9 (cherry picked from commit 82b9690b31d575c5aebe4c3b0f51ead38fadf3b0) --- M extension.json 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageForms refs/changes/00/325100/1 diff --git a/extension.json b/extension.json index 65ede80..9696446 100644 --- a/extension.json +++ b/extension.json @@ -437,7 +437,7 @@ "HighlightedDaysOfWeek": null, "DisabledDates": null, "HighlightedDates": null, - "merge_strategy": "array_plus" + "_merge_strategy": "array_plus" } }, "manifest_version": 1 -- To view, visit https://gerrit.wikimedia.org/r/325100 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4211e36598db95c62806a269b90403d4f7b578c9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/PageForms Gerrit-Branch: REL1_28 Gerrit-Owner: Paladox <thomasmulhall...@yahoo.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits