git.iko.soy/unity8
on xenial help sign in
Remove the failed merge message.
cb1f0d4Leo Arias
tests/autopilot/unity8/shell/emulators/main_window.py−1
compare with xenial
unifiedsplit
@@ -162,4 +162,3 @@ class QQuickView(emulators.UnityEmulatorBase):
162 'PinPadButton',
162 'PinPadButton',
163 objectName='pinPadButton{}'.format(button_id)
163 objectName='pinPadButton{}'.format(button_id)
164 )
164 )
165−>>>>>>> MERGE-SOURCE