From acf7627f5c57d62fd7d93dd9794911c6e7b4e42f Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.28>
Date: 星期五, 19 十月 2018 14:15:51 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/.settings/org.eclipse.wst.common.component |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/gx_tieta/.settings/org.eclipse.wst.common.component b/gx_tieta/.settings/org.eclipse.wst.common.component
index ac2fc84..58adfff 100644
--- a/gx_tieta/.settings/org.eclipse.wst.common.component
+++ b/gx_tieta/.settings/org.eclipse.wst.common.component
@@ -4,6 +4,6 @@
         <wb-resource deploy-path="/" source-path="/WebRoot"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
         <property name="java-output-path" value="/fuguang/WebRoot/WEB-INF/classes"/>
-        <property name="context-root" value="/fuguang"/>
+        <property name="context-root" value="/gx_tieta"/>
     </wb-module>
 </project-modules>

--
Gitblit v1.9.1