Hi Juliusz,

On Thu, Aug 31, 2006 at 21:07:59 +0200, Juliusz Chroboczek wrote:
> This conflicts with your later (and already committed) change
> 
>   Sat Aug 12 16:31:13 CEST 2006  Eric Kow <[EMAIL PROTECTED]>
>     * Read sftp batch file in from stdin (part of issue237).
> 
> Can you resubmit, or shall I fix the merge conflicts?

I will resubmit sometime this weekend.

-- 
Eric Kow                     http://www.loria.fr/~kow
PGP Key ID: 08AC04F9         Merci de corriger mon français.

Attachment: pgpSaFkdQIie4.pgp
Description: PGP signature

_______________________________________________
darcs-devel mailing list
[email protected]
http://www.abridgegame.org/cgi-bin/mailman/listinfo/darcs-devel

Reply via email to