0b41016535
Conflicts: .settings/org.eclipse.jdt.core.prefs src/test/java/ch/psi/daq/test/queryrest/controller/DaqRestControllerTest.java
18 lines
696 B
INI
18 lines
696 B
INI
#
|
|
<<<<<<< HEAD
|
|
#Thu Oct 29 09:13:22 CET 2015
|
|
=======
|
|
#Wed Oct 28 12:53:12 CET 2015
|
|
>>>>>>> refs/heads/master
|
|
org.eclipse.jdt.core.compiler.debug.localVariable=generate
|
|
org.eclipse.jdt.core.compiler.compliance=1.8
|
|
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
|
|
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
|
|
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
|
|
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
|
|
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
|
|
eclipse.preferences.version=1
|
|
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
|
|
org.eclipse.jdt.core.compiler.source=1.8
|
|
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
|