Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

removed conflicted code (my fault!) 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162832 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michal Maczka 2004-06-22 19:53:33 +00:00
parent 61ead8784f
commit d313ec01db
1 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
maven-model/maven.mdo
View File

@ -735,7 +735,6 @@
</fields>
</class>
<class>
<<<<<<< maven.mdo
<name>DistributionManagement</name>
<version>4.0.0</version>
<description>
@ -757,29 +756,6 @@
</fields>
</class>
<class>
=======
<name>DistributionManagement</name>
<version>4.0.0</version>
<description>
This elements describes all that pertains to distribution for a project.
</description>
<fields>
<field>
<name>host</name>
<version>4.0.0</version>
<description>The FQDN of the host where the site resides.</description>
<type>String</type>
</field>
<field>
<name>directory</name>
<description>The directory on the host where the site resides.</description>
<version>4.0.0</version>
<type>String</type>
</field>
</fields>
</class>
<class>
>>>>>>> 1.41
<name>License</name>
<version>3.0.0+</version>
<fields>