X-Git-Url: http://source.jalview.org/gitweb/?p=jabaws.git;a=blobdiff_plain;f=.settings%2Forg.eclipse.wst.common.component;fp=.settings%2Forg.eclipse.wst.common.component;h=0f3e747334877bd5a81cd55af87003f5dd9f76fb;hp=4a1ad2721858c546af060e623dfaa21494926eb1;hb=b19d5c38c97cf895fc3379a918b5dcf1f3f2031e;hpb=b7a076f21e11b8cfa99f9e52759dcff702b957fd

diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 4a1ad27..0f3e747 100644
--- 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>