On 06/07/15 04:20, Albert Astals Cid wrote:
> Review: Needs Fixing
>
> Setting as needs fixing because of
> Text conflict in qml/OrientedShell.qml
> Text conflict in tests/qmltests/tst_OrientedShell.qml
> 2 conflicts encountered.
>
> Should top-approve again once re-merged
On 06/07/15 04:20, Albert Astals Cid wrote: ll.qml tst_OrientedShe ll.qml
> Review: Needs Fixing
>
> Setting as needs fixing because of
> Text conflict in qml/OrientedShe
> Text conflict in tests/qmltests/
> 2 conflicts encountered.
>
> Should top-approve again once re-merged
Fixed.