search

oxidecomputer / omicron

Omicron: Oxide control plane
Mozilla Public License 2.0
252 stars 40 forks source link

fix Cargo.lock merge #7064

Closed iliana closed 1 week ago

iliana commented 1 week ago

7017 vs #7050 semantic merge conflict.

sunshowers commented 1 week ago

I've also included a fix in https://github.com/oxidecomputer/omicron/pull/7022 which I've queued for landing.