On Mon, 6 Feb 2006 18:07:21 +0100
Micha Nelissen <[EMAIL PROTECTED]> wrote:

> the GUI client though. But conflicts very rarely happen.

Except for ide/revision.inc though, that one conflicts quickly. It does not
matter much how you resolve this conflict though, just take your own
modification number.

Micha

_________________________________________________________________
     To unsubscribe: mail [EMAIL PROTECTED] with
                "unsubscribe" as the Subject
   archives at http://www.lazarus.freepascal.org/mailarchives

Reply via email to