Remove the failed merge message.
commitcb1f0d4d008ae7dc4de84147f65ffcb17c662384
authorLeo Arias <leo.arias@canonical.com>
dateMon 11 Aug 2014, 09:29 (12 years ago)
parent5017345
tests/autopilot/unity8/shell/emulators/main_window.py−1
@@ -162,4 +162,3 @@ class QQuickView(emulators.UnityEmulatorBase):
162162 'PinPadButton',
163163 objectName='pinPadButton{}'.format(button_id)
164164 )
165−>>>>>>> MERGE-SOURCE