Hi Michael, at this point trunk has diverged somewhat dramatically. Would you mind fixing the conflicts, and then I will finish reviewing this? I don't mind doing it if you prefer, just let me know. Thanks!
Text conflict in softwarecenter/ui/gtk3/panes/availablepane.py
Text conflict in softwarecenter/ui/gtk3/views/lobbyview.py
Text conflict in tests/gtk3/test_catview.py
Text conflict in tests/gtk3/windows.py
Hi Michael, at this point trunk has diverged somewhat dramatically. Would you mind fixing the conflicts, and then I will finish reviewing this? I don't mind doing it if you prefer, just let me know. Thanks!
Text conflict in softwarecenter/ ui/gtk3/ panes/available pane.py ui/gtk3/ views/lobbyview .py test_catview. py windows. py
Text conflict in softwarecenter/
Text conflict in tests/gtk3/
Text conflict in tests/gtk3/