From: Sasha <Main-laptop2>
Date: Fri, 14 Jun 2013 14:34:28 +0000 (+0100)
Subject: Fix core WST file
X-Git-Url: http://source.jalview.org/gitweb/?p=jabaws.git;a=commitdiff_plain;h=95f90d3cf2da6f32d396bceb79946a8e2880c4bd

Fix core WST file
---

diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 0f3e747..d25fa4e 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -13,10 +13,6 @@
             <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
+        <property name="context-root" value="jabaws"/>
     </wb-module>
 </project-modules>