Conflicts: src/main/java/ch/ethz/seb/sebserver/gbl/model/session/ClientInstruction.java src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/ExamProctoringController.java |
||
|---|---|---|
| .. | ||
| api | ||
| async | ||
| client | ||
| model | ||
| profile | ||
| util | ||
| Constants.java | ||
Conflicts: src/main/java/ch/ethz/seb/sebserver/gbl/model/session/ClientInstruction.java src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/ExamProctoringController.java |
||
|---|---|---|
| .. | ||
| api | ||
| async | ||
| client | ||
| model | ||
| profile | ||
| util | ||
| Constants.java | ||