22c0dd872d
Conflicts: src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/exam/impl/ExamAdminServiceImpl.java |
||
---|---|---|
.. | ||
main | ||
test |
22c0dd872d
Conflicts: src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/exam/impl/ExamAdminServiceImpl.java |
||
---|---|---|
.. | ||
main | ||
test |