|  3349d67d5a Conflicts: pom.xml src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/ExamSessionControlTask.java src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/ExamMonitoringController.java | ||
|---|---|---|
| .. | ||
| 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 | ||