Code review comment for lp:~lukas-kde/unity8/windowOpenCloseAnimations

Revision history for this message
Albert Astals Cid (aacid) wrote :

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.

« Back to merge proposal