resolve #6624 vs #6581 semantic merge conflict

oxidecomputer / omicron

Omicron: Oxide control plane

Mozilla Public License 2.0

244 stars 38 forks source link

resolve #6624 vs #6581 semantic merge conflict #6660

Closed iliana closed 5 days ago

iliana commented 5 days ago

💥 #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.