[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Addition of SES local printer functions.
|
From: |
Eli Zaretskii |
|
Subject: |
Re: Addition of SES local printer functions. |
|
Date: |
Thu, 02 Jan 2014 23:01:43 +0200 |
> From: Vincent Belaïche <address@hidden>
> Date: Thu, 02 Jan 2014 21:23:55 +0100
> Cc: Stefan Monnier <address@hidden>, address@hidden
>
> conflicts:
> Conflict: can't delete info because it is not empty. Not deleting.
That's because the info directory was deleted from the repository.
Remove all of its contents by shell commands, then type this:
bzr resolve --take-other