[VM][UNIX][FIX] copy-paste is freezing my machine

Bert Freudenberg bert at isg.cs.uni-magdeburg.de
Mon Mar 11 17:12:24 UTC 2002


On Mon, 11 Mar 2002, Ned Konz wrote:

> Hmm... the check-in had a conflict that is causing compile errors 
> (sqXWindow.c, around line 532):
> 
>     else /* if in browser we will be reparented and mapped by plugin */
>       {
> <<<<<<< sqXWindow.c
> 	/* DPRINT("VM: send window\n"); */
> =======
> >>>>>>> 1.28
> 	/* tell browser our window */

Actually this is a local artefact when automatic merging fails. Most 
certainly CVS complained when updating. You know, you have to read those 
messages ;-)

If you haven't hacked sqXWindow.c yourself, just delete the file and
update again.

-- Bert




More information about the Squeak-dev mailing list