Re: [Scribia-dev] crash & new stuff

[Charles L. <da...@sy...>]

>Yes, that means there were irreconcilable differences. The file date
>is also set to 2019. In this case i had previously deleted the line
>you had commented out on your own. The new file had it deleted, you
>had it commented out, and CVS doesnt know which you want, so it does
>that. (it is clearer when it happens in code)

oops. sorry. oh well, live and learn :)


--

charles lechasseur - da...@sy...
http://www3.sympatico.ca/danov/marathon/

  "The butts of evil are awaiting my bootprints!"
     - Minsc