[lazarus] Problems with CVS

[Marc Weustink]

At 15:59 1-8-2003 -0400, Bob Wingard wrote:
>Bob Wingard wrote:
>
>>Mattias,
>>    Please look at the last CVS update you made, it does not look like it 
>> patched dialogs.pp correctly. I can not build. When I look at the 
>> dialogs.pp file I see things like <<<<<<< 1.33  which look like version 
>> numbers but they are not comment lines and the compiler does not like them.
><snip>
>
>Never mind, I deleted the local copy and tried again and it worked this time.

What you saw was the result of a merge conflict at your side. You should 
have seen a notice that there was a confilct.

Marc



>Bob
>
>_________________________________________________________________
>     To unsubscribe: mail lazarus-request at miraclec.com with
>                "unsubscribe" as the Subject
>   archives at http://www.lazarus.freepascal.org/mailarchives