From 613a7d4a3b33966366feafa68ae0d240bb5aed47 Mon Sep 17 00:00:00 2001 From: Philippe Branchu Date: Sat, 28 Mar 2026 04:19:43 +0000 Subject: [PATCH] Fix corrupt Cargo.lock (resolve merge conflict markers) Co-Authored-By: Claude Opus 4.6 (1M context) --- Cargo.lock | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a5b30bfc..df329192 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -7687,11 +7687,7 @@ checksum = "f2f6fb2847f6742cd76af783a2a2c49e9375d0a111c7bef6f71cd9e738c72d6e" dependencies = [ "memoffset", "tempfile", -<<<<<<< Updated upstream "windows-sys 0.61.2", -======= - "windows-sys 0.60.2", ->>>>>>> Stashed changes ] [[package]]