Jdlrobson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/404612 )
Change subject: Merge remote-tracking branch 'origin/specialpages' into
review/jdlrobson/css-cull
......................................................................
Merge remote-tracking branch 'origin/specialpages' into
review/jdlrobson/css-cull
Change-Id: Ide02648f3d7a0367d4cc59d8f54d491b9826cf22
---
M skin.json
1 file changed, 1 insertion(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/MinervaNeue
refs/changes/12/404612/1
diff --git a/skin.json b/skin.json
index c24e21c..df067ee 100644
--- a/skin.json
+++ b/skin.json
@@ -42,14 +42,12 @@
},
"ResourceModuleSkinStyles": {
"minerva": {
-<<<<<<< HEAD (75cbf8 Restrict gallery styles to only pages which need it)
"mediawiki.page.gallery.styles": [
"skinStyles/mediawiki.page.gallery.styles/galleries.less",
"skinStyles/mediawiki.page.gallery.styles/tablet.less"
-=======
+ ],
"mobile.special.mobileoptions.styles": [
"skinStyles/mobile.special.mobileoptions.styles/minerva.less"
->>>>>>> BRANCH (dede84 Minerva should use FeatureManagers class)
],
"mediawiki.special.userlogin.common.styles": [
"skinStyles/mediawiki.special.userlogin.common.styles/minerva.less"
--
To view, visit https://gerrit.wikimedia.org/r/404612
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ide02648f3d7a0367d4cc59d8f54d491b9826cf22
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/MinervaNeue
Gerrit-Branch: firsterpaint
Gerrit-Owner: Jdlrobson <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
