Return-Path: Delivered-To: apmail-ant-notifications-archive@locus.apache.org Received: (qmail 94241 invoked from network); 2 Jul 2008 10:04:49 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 2 Jul 2008 10:04:49 -0000 Received: (qmail 86305 invoked by uid 500); 2 Jul 2008 10:04:50 -0000 Delivered-To: apmail-ant-notifications-archive@ant.apache.org Received: (qmail 86282 invoked by uid 500); 2 Jul 2008 10:04:50 -0000 Mailing-List: contact notifications-help@ant.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ant.apache.org Delivered-To: mailing list notifications@ant.apache.org Received: (qmail 86273 invoked by uid 99); 2 Jul 2008 10:04:50 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Jul 2008 03:04:50 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Jul 2008 10:04:07 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 79D2E2388AB9; Wed, 2 Jul 2008 03:03:35 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r673341 [8/26] - in /ant/ivy/site/target: ./ history/trunk/ history/trunk/configuration/ history/trunk/images/ history/trunk/ivyfile/ history/trunk/resolver/ history/trunk/samples/ history/trunk/use/ style/ Date: Wed, 02 Jul 2008 10:03:33 -0000 To: notifications@ant.apache.org From: xavier@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080702100335.79D2E2388AB9@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Added: ant/ivy/site/target/history/trunk/ivyfile/conflict.html URL: http://svn.apache.org/viewvc/ant/ivy/site/target/history/trunk/ivyfile/conflict.html?rev=673341&view=auto ============================================================================== --- ant/ivy/site/target/history/trunk/ivyfile/conflict.html (added) +++ ant/ivy/site/target/history/trunk/ivyfile/conflict.html Wed Jul 2 03:03:31 2008 @@ -0,0 +1,149 @@ + + + + + + + + + +conflict | Apache Ivy + + + + + + + + + + +
+ + + + + + + + + + + + + +
+ +
+ +
+ + + + +
+ + +
+ + +
+ + + +