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

Revision history for this message
Mirco Müller (macslow) wrote :

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();

review: Needs Fixing

« Back to merge proposal