From c003a8dd9c833bf3465d79444664e8e46e342fc6 Mon Sep 17 00:00:00 2001
From: AnnsAnn <git@annsann.eu>
Date: Thu, 25 Jan 2024 15:27:49 +0100
Subject: [PATCH] Fix cargo lock

---
 Cargo.lock | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 900d8c8..3fc2f45 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -967,19 +967,11 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "openssl"
-<<<<<<< HEAD
 version = "0.10.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "15c9d69dd87a29568d4d017cfe8ec518706046a05184e5aea92d0af890b803c8"
 dependencies = [
  "bitflags 2.4.2",
-=======
-version = "0.10.60"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79a4c6c3a2b158f7f8f2a2fc5a969fa3a068df6fc9dbb4a43845436e3af7c800"
-dependencies = [
- "bitflags 2.4.0",
->>>>>>> b51cf3478081367481d5760eca043888ff9eedff
  "cfg-if",
  "foreign-types",
  "libc",
@@ -1007,15 +999,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-sys"
-<<<<<<< HEAD
 version = "0.9.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "22e1bf214306098e4832460f797824c05d25aacdf896f64a985fb0fd992454ae"
-=======
-version = "0.9.96"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3812c071ba60da8b5677cc12bcb1d42989a65553772897a7e0355545a819838f"
->>>>>>> b51cf3478081367481d5760eca043888ff9eedff
 dependencies = [
  "cc",
  "libc",