[Merge] lp:~uriboni/webbrowser-app/tab-context-menu into lp:webbrowser-app

Ugo Riboni ugo.riboni at canonical.com
Mon Sep 14 08:18:50 UTC 2015


> This branch has conflicts when merging into the latest trunk. Can you please
> resolve them?

The conflicting changes were related to the tabs model, which you changed for the "sad tab" MR. The change was about correctly setting the current index when a tab is removed before the current tab (rev 1002.3.23), and corresponding additions to the unit tests.
My branch does the same thing, even if in a different way, so I simply reverted the two conflicting files to my version when merging from trunk. As far as I can tell everything should work as you intended and should be tested too, but please double check.
-- 
https://code.launchpad.net/~uriboni/webbrowser-app/tab-context-menu/+merge/268220
Your team Ubuntu Phablet Team is subscribed to branch lp:webbrowser-app.



More information about the Ubuntu-reviews mailing list