fermyon / enterprise-architectures-and-patterns

Collection of Enterprise Architectures & Patterns built with Spin and WebAssembly
50 stars 12 forks source link

chore(*): remove merge conflicts; update Cargo.tomls; regenerate Cargo.locks #13

Closed vdice closed 4 months ago

vdice commented 4 months ago

A fair amount of merge conflict cruft snuck in at some point (see https://github.com/search?q=repo%3Afermyon%2Fenterprise-architectures-and-patterns%20%3C%3C%3C%3C&type=code)

This updates affected Cargo.toml and Cargo.lock files.

Note: the relevant Cargo.lock files were totally regenerated (eg rm Cargo.lock; spin build) so it is possible that more dependency updates came in than usually desired. Please advise if we want to try to pursue a more targeted update.