Merge branch 'JABAWS_Release_2_0'

[jabaws.git] / .settings / org.eclipse.wst.common.component

diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 4a1ad27..0f3e747 100644 (file)
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -13,6 +13,10 @@
             <dependency-type>uses</dependency-type>
         </dependent-module> -->
         <property name="java-output-path" value="WEB-INF/classes"/>
+<<<<<<< HEAD
         <property name="context-root" value="jabaws-2.0"/>
+=======
+        <property name="context-root" value="jabaws-2.1"/>
+>>>>>>> JABAWS_Release_2_0
     </wb-module>
 </project-modules>