Commit 443af4b3 authored by Benedikt Kleinmeier's avatar Benedikt Kleinmeier
Browse files

Merged branch 'master' into add_event_handling, but removed event handling in...

Merged branch 'master' into add_event_handling, but removed event handling in "OptimalStepsModel.java" to avoid merge conflicts.

# Conflicts:
#	.gitlab-ci.yml
#	VadereModelTests/TestOSM/scenarios/rimea_14_select_route_pso.scenario
#	VadereSimulator/src/org/vadere/simulator/control/Simulation.java
#	VadereSimulator/src/org/vadere/simulator/models/osm/OptimalStepsModel.java
parents 142e78fc 87b4fe32
Pipeline #73580 failed with stages
in 77 minutes and 48 seconds