You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
21 lines
1.0 KiB
21 lines
1.0 KiB
<<<<<<< HEAD
|
|
eclipse.preferences.version=1
|
|
org.eclipse.jdt.core.compiler.codegen.methodParameters=generate
|
|
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
|
|
org.eclipse.jdt.core.compiler.compliance=1.8
|
|
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
|
|
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
|
|
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
|
|
org.eclipse.jdt.core.compiler.release=disabled
|
|
org.eclipse.jdt.core.compiler.source=1.8
|
|
=======
|
|
eclipse.preferences.version=1
|
|
org.eclipse.jdt.core.compiler.codegen.methodParameters=generate
|
|
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
|
|
org.eclipse.jdt.core.compiler.compliance=1.8
|
|
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
|
|
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
|
|
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
|
|
org.eclipse.jdt.core.compiler.release=disabled
|
|
org.eclipse.jdt.core.compiler.source=1.8
|
|
>>>>>>> branch 'master' of http://82.156.111.58:3000/maojian/appliction_manager.git
|