Unity

Code review comment for lp://qastaging/~3v1n0/unity/spread-title-improved

  1. spread-title-improved
  2. Merge into trunk
Revision history for this message
Martin Mrazik (mrazik) wrote :

There is a conflict:

Retrieving 'bzr+ssh://bazaar.launchpad.net/~3v1n0/unity/spread-title-improved' to put at 'work'.
Merging 'lp:unity' in to 'work'.
Warning: criss-cross merge encountered. See bzr help criss-cross.
Text conflict in plugins/unityshell/src/unityshell.cpp
1 conflicts encountered.
bzr: ERROR: Conflicts from merge

« Back to merge proposal