Re: [lojban] NT translation

[Robin Lee Powell <rlpowell@digitalkingdom.org>]

On Mon, Jul 09, 2001 at 08:29:53PM -0400, John Cowan wrote:
> 6.  If there is a conflict, CVS makes you figure out what the Right
>     Thing is, and won't let you upload until you do.

Actually, normally it just places the conflict in the file in such a way
as to make it Very Obvious.

-Robin

-- 
http://www.digitalkingdom.org/~rlpowell/ 	BTW, I'm male, honest.
le datni cu djica le nu zifre .iku'i .oi le so'e datni cu to'e te pilno
je xlali -- RLP 				http://www.lojban.org/