Subj : binkit error
To   : Dumas Walker
From : Digital Man
Date : Sun Dec 01 2019 11:29 am

  Re: binkit error
  By: Dumas Walker to DIGITAL MAN on Sun Dec 01 2019 10:12 am

 > >Those are merge-conflict markers. Simply deleting the version you have
 > locally >nd getting again via CVS will fix that.
 >
 > Ahh, I have seen those pop up in menu files before too and wondered how
 > they got there!  :)
 >
 > > "cvs update -C" would also work.
 >
 > So that will cause the new version to overwrite rather than merge?

Correct.

                                            digital man

This Is Spinal Tap quote #31:
Viv Savage: Quite exciting, this computer magic!
Norco, CA WX: 58.3øF, 50.0% humidity, 0 mph ESE wind, 0.00 inches rain/24hrs

.