On Mon, Aug 18, 2003 at 07:47:02PM -0700, Daniel Rogers wrote: > the makefiles in gegl/gegl in cvs seem to be broken. Here is the error > on a "make clean" > > Makefile:502: *** missing separator. Stop. > > 502 of makefile.am looks like : > 501: ======= > 502: >>>>>>> 1.61 > > This is not a makefile syntax I am familar with, but it seems to > correspond with: > > 127: <<<<<<< Makefile.am > > and there is a similar syntax in Makefile.am > What is going on here? I could be mistaken, but I believe this is due to CVS merge conflicts. CVS then inserts a diff into the source file, thats the >>>>>>> you see. Sometimes you may accidentally check in that file, without removing the diff. Jelle
