Comment 13 for bug 1006434

Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

@Sam

This looks like what his branch is doing. When you try to set Show Desktop plugin to active with his branch is gives you an option to Not enable Show Desktop plugin or Disable Unityshell plugin. So this branch seems to raise a conflict warning, which seems correct.