On Saturday 12 August 2006 17:28, [EMAIL PROTECTED] wrote: > The following occurs when running an update world following a sync today. > > --- Invalid atom in /usr/portage/profiles/package.mask: >>>>>>> 1.5723 > --- Invalid atom in /usr/portage/profiles/package.mask: ======= > --- Invalid atom in /usr/portage/profiles/package.mask: <<<<<<< [...] > There are 1500+ lines and I didn't know what to look for:
You could look for lines including ">>>>", "====" or "<<<<". Those are actual lines in package.mask that are invalid and caused by a cvs conflict... But as previously posted just sync again. -- Bo Andresen
pgp4EZdcWwNNG.pgp
Description: PGP signature
