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

> There's a merge-conflict in plugins/unityshell/src/BamfLauncherIcon.h with
> trunk...
>
> const char* DesktopFile();
> bool IsSticky();
> <<<<<<< TREE
> void Quit();
> void Stick();
> =======
> void Stick(bool save = true);
> >>>>>>> MERGE-SOURCE
> void UnStick();

Fixed.