Conflicts: src/test/java/ch/ethz/seb/sebserver/webservice/integration/api/admin/UserAPITest.java |
||
|---|---|---|
| .. | ||
| api | ||
| oauth | ||
| WebServiceSecurityConfig.java | ||
| WebServiceShutdown.java | ||
| WebServiceUserDetails.java | ||
Conflicts: src/test/java/ch/ethz/seb/sebserver/webservice/integration/api/admin/UserAPITest.java |
||
|---|---|---|
| .. | ||
| api | ||
| oauth | ||
| WebServiceSecurityConfig.java | ||
| WebServiceShutdown.java | ||
| WebServiceUserDetails.java | ||