# Conflicts: # src/main/java/ch/ethz/seb/sebserver/gui/service/examconfig/impl/AttributeMapping.java # src/main/resources/config/application-dev-ws.properties  | 
			||
|---|---|---|
| .. | ||
| ch/ethz/seb/sebserver | ||
				# Conflicts: # src/main/java/ch/ethz/seb/sebserver/gui/service/examconfig/impl/AttributeMapping.java # src/main/resources/config/application-dev-ws.properties  | 
			||
|---|---|---|
| .. | ||
| ch/ethz/seb/sebserver | ||