46786af1d6
Conflicts: src/main/java/ch/ethz/seb/sebserver/ClientHttpRequestFactoryService.java src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/ExamSessionServiceImpl.java src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SEBClientConnectionServiceImpl.java src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/indicator/DistributedPingCache.java src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/ExamAPI_V1_Controller.java src/main/resources/config/application-dev-ws.properties |
||
---|---|---|
.. | ||
sql | ||
application-dev-gui.properties | ||
application-dev-ws.properties | ||
application-dev.properties | ||
application-gui.properties | ||
application-ws.properties | ||
application.properties | ||
ehcache.xml | ||
initialPermittedProcesses.xml | ||
initialProhibitedProcesses.xml |