git://source.jalview.org / jabaws.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b7a076f fe7da3c)
Merge branch 'JABAWS_Release_2_0'
authorSasha <Main-laptop2>
Fri, 14 Jun 2013 13:59:36 +0000 (14:59 +0100)
committerSasha <Main-laptop2>
Fri, 14 Jun 2013 13:59:36 +0000 (14:59 +0100)
Conflicts:
.project
.settings/org.eclipse.wst.common.component

1  2 
.settings/org.eclipse.wst.common.component patch | diff1 | diff2 | blob | history

diff --cc .settings/org.eclipse.wst.common.component
index 4a1ad27,1c91d84..0f3e747
--- 1/.settings/org.eclipse.wst.common.component
--- 2/.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>