From d313ec01db2759b07a234ec42a10958861297a69 Mon Sep 17 00:00:00 2001
From: Michal Maczka <michal@apache.org>
Date: Tue, 22 Jun 2004 19:53:33 +0000
Subject: [PATCH] removed conflicted code (my fault!)

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162832 13f79535-47bb-0310-9956-ffa450edef68
---
 maven-model/maven.mdo | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/maven-model/maven.mdo b/maven-model/maven.mdo
index 01d1a5d7f4..d66e85fabb 100644
--- a/maven-model/maven.mdo
+++ b/maven-model/maven.mdo
@@ -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>