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
Attempt to merge lp:~mandel/desktopcouch/fix_bug_519873 into lp:desktopcouch failed due to merge conflicts:
text conflict in bin/desktopcouc h-stop