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();
« Back to merge proposal
There's a merge-conflict in plugins/ unityshell/ src/BamfLaunche rIcon.h with trunk...
const char* DesktopFile();
bool IsSticky();
<<<<<<< TREE
void Quit();
void Stick();
=======
void Stick(bool save = true);
>>>>>>> MERGE-SOURCE
void UnStick();