> Attempt to merge into lp:unity-2d failed due to conflicts: > > text conflict in launcher/Launcher.qml > text conflict in launcher/app/launcherview.cpp
Merge conflicts resolved
« Back to merge proposal
> Attempt to merge into lp:unity-2d failed due to conflicts: Launcher. qml app/launchervie w.cpp
>
> text conflict in launcher/
> text conflict in launcher/
Merge conflicts resolved