Skip to content

Commit f21d79d

Browse files
authored
resolve #6624 vs #6581 semantic merge conflict (#6660)
💥 #6624 added a collection parameter to `BlueprintBuilder::new_based_on`. #6581 added new calls to `new_based_on` in tests without having those changes present.
1 parent 0c7fb27 commit f21d79d

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

nexus/reconfigurator/planning/src/planner.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1406,6 +1406,7 @@ mod test {
14061406
&logctx.log,
14071407
&blueprint1,
14081408
&input,
1409+
&collection,
14091410
TEST_NAME,
14101411
)
14111412
.expect("failed to build blueprint builder");
@@ -1423,6 +1424,7 @@ mod test {
14231424
&logctx.log,
14241425
&blueprint1,
14251426
&input,
1427+
&collection,
14261428
TEST_NAME,
14271429
)
14281430
.expect("failed to build blueprint builder");

0 commit comments

Comments
 (0)