Conflicts: src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ClientConnectionDAOImpl.java |
||
|---|---|---|
| .. | ||
| authorization | ||
| bulkaction | ||
| dao | ||
| exam | ||
| lms | ||
| sebconfig | ||
| session | ||
| validation | ||
| PaginationService.java | ||
| PaginationServiceImpl.java | ||
Conflicts: src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ClientConnectionDAOImpl.java |
||
|---|---|---|
| .. | ||
| authorization | ||
| bulkaction | ||
| dao | ||
| exam | ||
| lms | ||
| sebconfig | ||
| session | ||
| validation | ||
| PaginationService.java | ||
| PaginationServiceImpl.java | ||