ITQC/gls_docs
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into ATEST-246

Browse Source 
Conflicts:
	.settings/org.eclipse.jdt.core.prefs
	src/test/java/ch/psi/daq/test/queryrest/controller/DaqRestControllerTest.java
This commit is contained in:
Fabian Märki
2015-10-30 11:46:30 +01:00
parent 2f6a012abb 327353d96d
commit 0b41016535
9 changed files with 745 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.settings/org.eclipse.jdt.core.prefs
View File

@ -1,5 +1,9 @@
#
<<<<<<< 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