From rlpowell@digitalkingdom.org Mon Jul 09 17:34:46 2001 Return-Path: X-Sender: rlpowell@digitalkingdom.org X-Apparently-To: lojban@yahoogroups.com Received: (EGP: mail-7_2_0); 10 Jul 2001 00:34:46 -0000 Received: (qmail 28791 invoked from network); 10 Jul 2001 00:34:46 -0000 Received: from unknown (10.1.10.26) by l8.egroups.com with QMQP; 10 Jul 2001 00:34:46 -0000 Received: from unknown (HELO chain.digitalkingdom.org) (64.169.75.101) by mta1 with SMTP; 10 Jul 2001 00:34:45 -0000 Received: from rlpowell by chain.digitalkingdom.org with local (Exim 3.22 #1 (Debian)) id 15JlUC-00008u-00 for ; Mon, 09 Jul 2001 17:34:44 -0700 Date: Mon, 9 Jul 2001 17:34:44 -0700 To: lojban@yahoogroups.com Subject: Re: [lojban] NT translation Message-ID: <20010709173444.J32090@digitalkingdom.org> Mail-Followup-To: lojban@yahoogroups.com References: Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.3.18i From: Robin Lee Powell 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/