Return-Path: Delivered-To: apmail-xml-cocoon-dev-archive@xml.apache.org Received: (qmail 19380 invoked by uid 500); 22 Sep 2002 03:20:17 -0000 Mailing-List: contact cocoon-dev-help@xml.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: list-post: Reply-To: cocoon-dev@xml.apache.org Delivered-To: mailing list cocoon-dev@xml.apache.org Received: (qmail 19369 invoked from network); 22 Sep 2002 03:20:16 -0000 Message-ID: <100b01c261e7$085baa80$0100a8c0@MAUCHI> From: "Ivelin Ivanov" To: Subject: inadvertent checked-in Date: Sat, 21 Sep 2002 22:20:41 -0500 MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit X-Priority: 3 X-MSMail-Priority: Normal X-Mailer: Microsoft Outlook Express 6.00.2600.0000 X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2600.0000 X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N After working on fixes and updates of XMLForm for the last few days, this morning I've checked in the files. However later I noticed that I inadvertedly checked in some files with uncleanly resolved conflicts caused by other people's recent work with CVS. I tried to fix the problem and I think the build is OK now, but if you find some problem and you see files with the label " patch for http://nagoya.apache.org/bugzilla/show_bug.cgi?id=12721 fixed several problems caused by recent changes in other C2.1 modules " which do not belong to the XMLForm components, please let me know. Regards, -=Ivelin=- --------------------------------------------------------------------- To unsubscribe, e-mail: cocoon-dev-unsubscribe@xml.apache.org For additional commands, email: cocoon-dev-help@xml.apache.org