From b3f62ab5fb6adf03a92f62b42e69ad849f903b45 Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期五, 28 十二月 2018 17:08:53 +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.project.facet.core.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/gx_tieta/.settings/org.eclipse.wst.common.project.facet.core.xml b/gx_tieta/.settings/org.eclipse.wst.common.project.facet.core.xml
index 2921e44..b92463e 100644
--- a/gx_tieta/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/gx_tieta/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -2,9 +2,9 @@
 <faceted-project>
   <runtime name="com.genuitec.runtime.generic.jee50"/>
   <fixed facet="jst.jsf"/>
-  <installed facet="java" version="1.5"/>
   <installed facet="jst.web" version="2.5"/>
   <installed facet="wst.jsdt.web" version="1.0"/>
   <installed facet="jst.jsf" version="1.2"/>
   <installed facet="jst.web.jstl" version="1.2"/>
+  <installed facet="java" version="1.8"/>
 </faceted-project>

--
Gitblit v1.9.1