Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/189193
Change subject: Merge branch 'master' of
ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook
......................................................................
Merge branch 'master' of
ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook
Conflicts:
components/navigation.less
Change-Id: I8257ca397a6bfcc84322fa608450934b9caeff55
---
M components/navigation.less
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook
refs/changes/93/189193/1
diff --git a/components/navigation.less b/components/navigation.less
index 4aa0dd1..81af542 100644
--- a/components/navigation.less
+++ b/components/navigation.less
@@ -189,12 +189,12 @@
top: 40px;
bottom: 0;
height: auto;
-<<<<<<< HEAD (1f19e7 Update navigation file)
+<<<<<<< HEAD
overflow-y: auto;
overflow-x: hidden;
=======
overflow: hidden;
->>>>>>> BRANCH (7ccfea Update Metrolook and bump version)
+>>>>>>> 7ccfeabce4709acace8ae7ac0aafccaba2117c71
padding-top: 1em;
width: 9.5em;
left: 0;
--
To view, visit https://gerrit.wikimedia.org/r/189193
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8257ca397a6bfcc84322fa608450934b9caeff55
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Metrolook
Gerrit-Branch: master
Gerrit-Owner: Paladox <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
