i don't think we need this anymore (#737)

This commit is contained in:
Adam Perkowski 2024-10-02 23:46:55 +02:00 committed by GitHub
parent 2f3c49ed0f
commit d5c05c94bb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -1,5 +0,0 @@
What to do when you have a Cargo.lock merge conflict?
1. `git checkout origin/main -- Cargo.lock` to get the original Cargo.lock
2. `cargo build` to update Cargo.lock
3. `git add Cargo.lock`
4. continue the merge as normal