-
Benedikt Kleinmeier authored
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
443af4b3