From d5c05c94bb67079c987dbaa4ad5665eb738a47ac Mon Sep 17 00:00:00 2001
From: Adam Perkowski <adas1per@protonmail.com>
Date: Wed, 2 Oct 2024 23:46:55 +0200
Subject: [PATCH] i don't think we need this anymore (#737)

---
 cargo-lock-merge.txt | 5 -----
 1 file changed, 5 deletions(-)
 delete mode 100644 cargo-lock-merge.txt

diff --git a/cargo-lock-merge.txt b/cargo-lock-merge.txt
deleted file mode 100644
index 649a99cf..00000000
--- a/cargo-lock-merge.txt
+++ /dev/null
@@ -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
\ No newline at end of file