Fix corrupt Cargo.lock (resolve merge conflict markers)

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Philippe Branchu
2026-03-28 04:19:43 +00:00
co-authored by Claude Opus 4.6
parent 6ed6d3ac3b
commit 613a7d4a3b
Generated
-4
View File
@@ -7687,11 +7687,7 @@ checksum = "f2f6fb2847f6742cd76af783a2a2c49e9375d0a111c7bef6f71cd9e738c72d6e"
dependencies = [
"memoffset",
"tempfile",
<<<<<<< Updated upstream
"windows-sys 0.61.2",
=======
"windows-sys 0.60.2",
>>>>>>> Stashed changes
]
[[package]]