jenkins-bot has submitted this change and it was merged.
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
---
M extension.json
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Paladox: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index c970181..5d6c33a 100644
--- a/extension.json
+++ b/extension.json
@@ -434,7 +434,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/325099
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4211e36598db95c62806a269b90403d4f7b578c9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageForms
Gerrit-Branch: master
Gerrit-Owner: Paladox <thomasmulhall...@yahoo.com>
Gerrit-Reviewer: Paladox <thomasmulhall...@yahoo.com>
Gerrit-Reviewer: Yaron Koren <yaro...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
