From: Sasha <Main-laptop2>
Date: Fri, 14 Jun 2013 13:59:36 +0000 (+0100)
Subject: Merge branch 'JABAWS_Release_2_0'
X-Git-Url: http://source.jalview.org/gitweb/?p=jabaws.git;a=commitdiff_plain;h=b19d5c38c97cf895fc3379a918b5dcf1f3f2031e

Merge branch 'JABAWS_Release_2_0'

Conflicts:
	.project
	.settings/org.eclipse.wst.common.component
---

b19d5c38c97cf895fc3379a918b5dcf1f3f2031e
diff --cc .settings/org.eclipse.wst.common.component
index 4a1ad27,1c91d84..0f3e747
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@@ -13,6 -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>