Text conflict in qml/Stages/DesktopStage.qml
Text conflict in qml/Stages/WindowResizeArea.qml
Text conflict in tests/mocks/Unity/Application/MirSurface.h
Text conflict in tests/qmltests/Stages/tst_DesktopStage.qml
Text conflict in tests/qmltests/Stages/tst_WindowResizeArea.qml
5 conflicts encountered.
Note: was already top approved
Text conflict in qml/Stages/ DesktopStage. qml WindowResizeAre a.qml Unity/Applicati on/MirSurface. h Stages/ tst_DesktopStag e.qml Stages/ tst_WindowResiz eArea.qml
Text conflict in qml/Stages/
Text conflict in tests/mocks/
Text conflict in tests/qmltests/
Text conflict in tests/qmltests/
5 conflicts encountered.