Currently job artifacts in CI/CD pipelines on LRZ GitLab never expire. Starting from Wed 26.1.2022 the default expiration time will be 30 days (GitLab default). Currently existing artifacts in already completed jobs will not be affected by the change. The latest artifacts for all jobs in the latest successful pipelines will be kept. More information:

Commit 8752d962 authored by Jakob Schöttl's avatar Jakob Schöttl
Browse files

Fix merge conflict

parent f6601b40
......@@ -7,13 +7,13 @@ import java.util.Random;
import java.util.Scanner;
import org.vadere.simulator.models.seating.trainmodel.TrainModel;
import org.vadere.state.attributes.Attributes;
import org.vadere.state.attributes.models.AttributesSeating;
import org.vadere.state.scenario.Et423Geometry;
import org.vadere.state.scenario.Topography;
import org.vadere.state.scenario.TrainGeometry;
import org.vadere.state.util.StateJsonConverter;
import org.vadere.state.util.TextOutOfNodeException;
public class TestTopographyAndModelBuilder {
......@@ -56,7 +56,7 @@ public class TestTopographyAndModelBuilder {
try {
final String json = new Scanner(TestTopographyAndModelBuilder.class.getResourceAsStream(TEST_TRAIN_TOPOGRAPHY_RESOURCE), "UTF-8").useDelimiter("\\A").next();
return JsonConverter.deserializeTopography(json);
return StateJsonConverter.deserializeTopography(json);
} catch (IOException | TextOutOfNodeException e) {
throw new RuntimeException(e);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment