Conflicts: src/main/java/ch/ethz/seb/sebserver/gui/content/ExamForm.java src/main/java/ch/ethz/seb/sebserver/gui/content/MonitoringRunningExam.java src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SEBClientConnectionServiceImpl.java src/test/resources/application-test.properties |
||
|---|---|---|
| .. | ||
| content | ||
| form | ||
| service | ||
| table | ||
| widget | ||
| GuiInit.java | ||
| GuiServiceInfo.java | ||
| GuiWebsecurityConfig.java | ||
| InstitutionalAuthenticationEntryPoint.java | ||
| ProctoringServlet.java | ||
| RAPConfiguration.java | ||
| RAPSpringConfig.java | ||
| StaticApplicationPropertyResolver.java | ||