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 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
"http://www.w3.org/TR/html4/strict.dtd";>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<html>
+<head>
+ <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
+ <script type="text/javascript">var xookiConfig = {level: 1};</script>
+
+
+ <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
+<title>conflict | Apache Ivy</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <link rel="stylesheet" type="text/css" href="../../../style/style.css" />
+ <script src="../../../js/jquery.pack.js" type="text/javascript"></script>
+ <script src="../../../js/jquery.treeview.js" type="text/javascript"></script>
+ <script type="text/javascript">
+ $(document).ready(function(){$("#treemenu").Treeview({speed: "fast",store:
true});});
+ </script>
+
+<script language="javascript" type="text/javascript">xooki = {u: function(url)
{return "../../../xooki/"+url;}};</script>
+</head>
+<body>
+
+<div id="body">
+<table id="header" summary="Navigation elements." border="0"
+ cellpadding="0" cellspacing="0" width="100%">
+ <tr>
+ <td id="home" width="30%"><a href="http://ant.apache.org/";
+ title="Apache Ant"><img
src="../../../images/ant-group-logo.gif" alt="Apache Ant"
+ border="0" /></a></td>
+
+ <td class="product" width="70%" align="right"
valign="middle"><img
+ src="../../../images/logo.png" alt="ivy" border="0"
/></td>
+ </tr>
+</table>
+
+<table id="top-menu" summary="Navigation elements." border="0"
+ cellpadding="0" cellspacing="0" width="100%">
+ <tr>
+ <td>
+
+ <div style="float:right;margin: 0 10px;">
+ <!-- Google CSE Search Box Begins -->
+ <form id="searchbox_014292259695392975429:5y6qypnrni8"
action="http://ant.apache.org/ivy/search.html";>
+ <input type="hidden" name="cx" value="014292259695392975429:5y6qypnrni8" />
+ <input type="hidden" name="cof" value="FORID:11" />
+ <input name="q" type="text" size="30" />
+ <input type="submit" name="sa" value="Search" />
+ </form>
+ <script type="text/javascript"
src="http://www.google.com/coop/cse/brand?form=searchbox_014292259695392975429%3A5y6qypnrni8";></script>
+<!-- Google CSE Search Box Ends -->
+ </div>
+
+ <div id="navcontainer">
+ <a href="http://ant.apache.org/";>Apache Ant</a> > <a
href="http://ant.apache.org/ivy/";>Ivy</a> > <span class="breadCrumb"><a
href="../../../history.html" >History</a> > <a
href="../../../history/trunk/index.html" >Trunk</a> > <a
href="../../../history/trunk/reference.html" >Reference</a> > <a
href="../../../history/trunk/ivyfile.html" >Ivy Files</a> > <a
href="../../../history/trunk/ivyfile/dependencies.html" >dependencies</a> >
<a href="../../../history/trunk/ivyfile/conflict.html"
class="current">conflict</a></span>
+ </div>
+ </td>
+ </tr>
+
+</table>
+
+<table id="content" border="0" cellpadding="0" cellspacing="0"
+ width="100%">
+ <tr>
+ <td id="sidebar-left">
+ <div class="block block-book" id="block-book-0">
+ <h2>Ivy</h2>
+
[... 66 lines stripped ...]
Propchange: ant/ivy/site/target/history/trunk/ivyfile/conflict.html
------------------------------------------------------------------------------
svn:eol-style = native
