|  254255b3ac Conflicts: src/main/java/ch/ethz/seb/sebserver/gbl/api/APIMessage.java src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SEBClientConnectionServiceImpl.java | ||
|---|---|---|
| .. | ||
| config | ||
| org/eclipse/swt/internal | ||
| static | ||
| .gitignore | ||
| logback-spring.xml | ||
| messages.properties | ||