Code review comment for lp:~azzar1/unity/fix-1033866

Revision history for this message
Unity Merger (unity-merger) wrote :

Attempt to merge into lp:unity failed due to conflicts:

text conflict in launcher/MockLauncherIcon.h
text conflict in tests/test_launcher.cpp

« Back to merge proposal