maven-m2-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mic...@apache.org
Subject cvs commit: maven-components/maven-model maven.mdo
Date Tue, 22 Jun 2004 19:53:33 GMT
michal      2004/06/22 12:53:33

  Modified:    maven-model maven.mdo
  Log:
  removed conflicted code (my fault!)
  
  Revision  Changes    Path
  1.43      +0 -24     maven-components/maven-model/maven.mdo
  
  Index: maven.mdo
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-model/maven.mdo,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- maven.mdo	22 Jun 2004 19:25:54 -0000	1.42
  +++ maven.mdo	22 Jun 2004 19:53:33 -0000	1.43
  @@ -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>
  
  
  

Mime
View raw message