Awight has uploaded a new change for review. https://gerrit.wikimedia.org/r/173243
Change subject: DO NOT MERGE octopus branches together for development ...................................................................... DO NOT MERGE octopus branches together for development Merge commit 'refs/changes/65/172665/11' of https://gerrit.wikimedia.org/r/mediawiki/extensions/CentralNotice into review/awight/173225 Conflicts: CentralNotice.hooks.php Change-Id: I46c456fd6a7d617f526c19d86ffb1b5714a3a1a9 --- M CentralNotice.hooks.php 1 file changed, 0 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralNotice refs/changes/43/173243/1 diff --git a/CentralNotice.hooks.php b/CentralNotice.hooks.php index 1e50517..6689930 100644 --- a/CentralNotice.hooks.php +++ b/CentralNotice.hooks.php @@ -374,9 +374,7 @@ } /** -<<<<<<< HEAD (3dbf2b refactor test fixtures as json) * Place CentralNotice ResourceLoader modules onto mobile pages. -======= * ResourceLoaderTestModules hook handler * @see https://www.mediawiki.org/wiki/Manual:Hooks/ResourceLoaderTestModules * @@ -424,7 +422,6 @@ /** * EnableMobileModules callback for placing the CN resourceloader * modules onto mobile pages. ->>>>>>> BRANCH (731533 Basic QUnit tests) * * @param Skin $skin * @param array $modules -- To view, visit https://gerrit.wikimedia.org/r/173243 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I46c456fd6a7d617f526c19d86ffb1b5714a3a1a9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CentralNotice Gerrit-Branch: master Gerrit-Owner: Awight <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
