jenkins-bot has submitted this change and it was merged.

Change subject: Revert "Define a merge strategy for JsonConfigs"
......................................................................


Revert "Define a merge strategy for JsonConfigs"

This reverts commit 55d85d06ed68f3d9b710ae2e362a5da8e7de87c4.

Change-Id: Ib38a1d652ce8c8b93161c5b59d602807e6e0c103
---
M extension.json
1 file changed, 1 insertion(+), 3 deletions(-)

Approvals:
  Reedy: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/extension.json b/extension.json
index 076cfc1..43afcd2 100644
--- a/extension.json
+++ b/extension.json
@@ -119,9 +119,7 @@
                ]
        },
        "config": {
-               "JsonConfigs": {
-                       "_merge_strategy": "array_merge_recursive"
-               },
+               "JsonConfigs": [],
                "JsonConfigModels": [],
                "JsonConfigDisableCache": false,
                "JsonConfigCacheKeyPrefix": "1",

-- 
To view, visit https://gerrit.wikimedia.org/r/315832
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib38a1d652ce8c8b93161c5b59d602807e6e0c103
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/JsonConfig
Gerrit-Branch: master
Gerrit-Owner: Reedy <re...@wikimedia.org>
Gerrit-Reviewer: Reedy <re...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to