Code review comment for lp:~mandel/desktopcouch/fix_bug_519873

Revision history for this message
Manuel de la Peña (mandel) wrote :

The merge should be possible now. As a side note since I have been using Lucid I get the fails that John reported.
> Attempt to merge lp:~mandel/desktopcouch/fix_bug_519873 into lp:desktopcouch
> failed due to merge conflicts:
>
> text conflict in bin/desktopcouch-stop

« Back to merge proposal