[lazarus] Problems with CVS

[Bob Wingard]

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.

Bob