Closed mucinoab closed 2 years ago
Thank you!
I am not quite sure what to do about the conflicts... 😞
I am not quite sure what to do about the conflicts... 😞
You can just check out Cargo.lock
from the master branch in your branch, and then run e.g. cargo check
again. It will generate a new fitting Cargo.lock
.
@mucinoab I merged the master and resolved the conflicts. Also removed a dbg statement. Ready to merge!
Fixes #158