RE: Addition of SES local printer functions.

[Vincent Belaïche]

Ok! My commit has gone through! Thank you Eli and all.

Note that I had to run `bzr resolve --take-other' twice, once with the
info directory and once without it.

FYI, I had also to place my change not in last position in the
doc/misc/ChangeLog file otherwise dates would have been out of sequence
--- probably this is an effect of the time difference. Here in France it
is still the 2nd of January, while in some other place it is already the
3rd.

Happy new year 2014!

  Vincent.

> Date: Thu, 2 Jan 2014 23:01:43 +0200
> From: address@hidden
> Subject: Re: Addition of SES local printer functions.
> To: address@hidden
> CC: address@hidden; address@hidden
>
> > 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
>
>