From 5ed3c2e5da5311be869b2e70785ca620f9f84e04 Mon Sep 17 00:00:00 2001
From: Murphy <chengzhiyi_2@163.com>
Date: Wed, 4 Oct 2023 11:42:07 -0400
Subject: [PATCH] neat

---
 Cargo.lock | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Cargo.lock b/Cargo.lock
index 626d08348866..ea4d70adb881 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4961,7 +4961,6 @@ dependencies = [
 ]
 
 [[package]]
-<<<<<<< HEAD
 name = "priority-queue"
 version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"