Text conflict in CMakeLists.txt
Text conflict in debian/control
Text conflict in qml/Stages/DesktopStage.qml
Text conflict in qml/Stages/SpreadDelegate.qml
Text conflict in qml/Stages/WindowResizeArea.qml
Text conflict in tests/mocks/Unity/Application/ApplicationManager.h
6 conflicts encountered.
Text conflict in CMakeLists.txt DesktopStage. qml SpreadDelegate. qml WindowResizeAre a.qml Unity/Applicati on/ApplicationM anager. h
Text conflict in debian/control
Text conflict in qml/Stages/
Text conflict in qml/Stages/
Text conflict in qml/Stages/
Text conflict in tests/mocks/
6 conflicts encountered.