From 99ed6cd7dc00f90b6161fbc44fc878f18ee248c2 Mon Sep 17 00:00:00 2001
From: didiyu <1293722656@qq.com>
Date: 星期二, 18 十二月 2018 15:55:35 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/.settings/org.eclipse.jdt.core.prefs |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gx_tieta/.settings/org.eclipse.jdt.core.prefs b/gx_tieta/.settings/org.eclipse.jdt.core.prefs
index f287d53..295926d 100644
--- a/gx_tieta/.settings/org.eclipse.jdt.core.prefs
+++ b/gx_tieta/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.8

--
Gitblit v1.9.1