Unity

Code review comment for lp://qastaging/~macslow/unity/unity.fix-841902

  1. unity.fix-841902
  2. Merge into trunk
Revision history for this message
Mirco Müller (macslow) wrote :

> Attempt to merge into lp:unity failed due to conflicts:
>
> text conflict in plugins/unityshell/src/FilterFactory.cpp
> text conflict in plugins/unityshell/src/FilterGenreWidget.cpp
> text conflict in plugins/unityshell/src/FilterGenreWidget.h

Seriously... WTF?!?!

« Back to merge proposal