Code review comment for lp:~javier.collado/utah/bug1095669-2

Revision history for this message
Javier Collado (javier.collado) wrote :

The merge conflict is because both lp:bug1095669 and lp:bug1095669-2 were
branched from the same dev branch revision and the latter is already merged.
Anyway, that's not a problem I'll fix the conflict in the merge itself.

« Back to merge proposal