Waetschker Daniel (uib17511) b2bc60394a Merge remote-tracking branch 'origin/master' ... # Conflicts: # app/src/main/java/de/hems/trafficsim/MainActivity.java # app/src/main/java/de/hems/trafficsim/Track.java		2020-10-29 13:46:59 +01:00
..
hems/trafficsim	Merge remote-tracking branch 'origin/master'	2020-10-29 13:46:59 +01:00