From ff397a9336bb6676e88454540565d0e7451a2ef9 Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139.mshome.net>
Date: 星期三, 09 一月 2019 17:40:41 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/.settings/org.eclipse.wst.common.component | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/gx_tieta/.settings/org.eclipse.wst.common.component b/gx_tieta/.settings/org.eclipse.wst.common.component
index 88fc9f5..30684a1 100644
--- a/gx_tieta/.settings/org.eclipse.wst.common.component
+++ b/gx_tieta/.settings/org.eclipse.wst.common.component
@@ -1,14 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-
+
+
<wb-module deploy-name="fuguang">
<wb-resource deploy-path="/" source-path="/WebRoot" tag="defaultRootSource"/>
<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="/gx_tieta"/>
<property name="me-merge-utility-modules" value="true"/>
-
- </wb-module>
+
+ </wb-module>
+
+
</project-modules>
--
Gitblit v1.9.1