Unity

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

  1. unity.fix-863246
  2. Merge into trunk
Revision history for this message
Unity Merger (unity-merger) wrote :

Attempt to merge into lp:unity failed due to conflicts:

text conflict in plugins/unityshell/resources/dash-widgets.json
text conflict in plugins/unityshell/src/FilterGenreWidget.cpp

« Back to merge proposal