git://source.jalview.org / jabaws.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b19d5c3)
Fix core WST file master
authorSasha <Main-laptop2>
Fri, 14 Jun 2013 14:34:28 +0000 (15:34 +0100)
committerSasha <Main-laptop2>
Fri, 14 Jun 2013 14:34:28 +0000 (15:34 +0100)
.settings/org.eclipse.wst.common.component patch | blob | history

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