pom.xml · 2a24c1a41d5818515266e3a884bfac26112d9865 · Simonstrator / PeerfactSim.KOM

Merge remote-tracking branch 'origin/master' into masterintegration · 2a24c1a4

Julian Zobel authored Sep 17, 2020

# Conflicts:
#	src/de/tud/kom/p2psim/impl/topology/movement/modularosm/ModularMultiTypeMovementModel.java
#	src/de/tud/kom/p2psim/impl/topology/movement/modularosm/transition/WeightedTransitionStrategy.java

2a24c1a4

pom.xml 12.2 KB

Replace pom.xml