Re: [Scribia-dev] crash & new stuff

[Ben H. <bh...@al...>]

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)

by the way, Erasmus was interested in scribia source so i pointed him 
to cvs and the website. Hopefully he will be able to help.

-Ben

At 10:44 AM -0500 3/24/01, Charles Lechasseur wrote:
>  >Anyway, my area is GUI and i've checked in sorting for all GUI views! :)
>
>weird. i just did a check out and here's what ended up in the
>CScribiaDocumentWindow.cp file, somewhere in the middle of the #includes:
>
><<<<<<< CScribiaDocumentWindow.cp
>//#include "CSharesTable.h"
>=======
>>>>>>>>  1.15
>
>sounds like some CVS log thing, but it obviously doesn't compile :) i
>deleted the weird lines and committed the change.
>
>
>--
>
>charles lechasseur - da...@sy...
>http://www3.sympatico.ca/danov/marathon/
>
>   "The butts of evil are awaiting my bootprints!"
>      - Minsc
>
>
>
>_______________________________________________
>Scribia-developers mailing list
>Scr...@li...
>http://lists.sourceforge.net/lists/listinfo/scribia-developers

-- 
NOTE: Please change my address in your address book from bh...@sa...
to bh...@al... as my UCSD address will be permanent.
<http://freepages.sf.rootsweb.com/~bhines/> - My Genealogy Pages