Joseph T. Lyons df84b9d94e Remove remnants from conflict resolution (#3528) ...

Fixes a couple of things that slipped through when going through the
last merge conflict

Release Notes:

- N/A

2023-12-06 23:44:49 -05:00

..

src

Remove remnants from conflict resolution (#3528)

2023-12-06 23:44:49 -05:00

Cargo.toml

Revert "Decouple workspace from call (#3380)"

2023-12-04 17:05:44 -08:00