Skip to content

Commit b594fa1

Browse files
eckterflomonster
authored andcommitted
core: stdcm: resolve undetected conflict
1 parent 81486cc commit b594fa1

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

core/src/test/java/fr/sncf/osrd/stdcm/STDCMPathfindingTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1501,7 +1501,8 @@ public void testImpossibleEngineeringAllowance() {
15011501
occupancyGraph,
15021502
timeStep,
15031503
POSITIVE_INFINITY,
1504-
POSITIVE_INFINITY
1504+
POSITIVE_INFINITY,
1505+
Set.of()
15051506
);
15061507

15071508
assertNull(res);

0 commit comments

Comments
 (0)