chore: fix conflicts

This commit is contained in:
Erica Marigold 2023-08-11 12:21:32 +05:30
parent f4f3040cd5
commit f1467f9ba9
No known key found for this signature in database
GPG key ID: 23CD97ABBBCC5ED2

26
Cargo.lock generated
View file

@ -198,21 +198,6 @@ version = "0.21.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d"
[[package]]
name = "bit-set"
version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1"
dependencies = [
"bit-vec",
]
[[package]]
name = "bit-vec"
version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
[[package]]
name = "bitflags"
version = "1.3.2"
@ -649,16 +634,6 @@ dependencies = [
"str-buf",
]
[[package]]
name = "fancy-regex"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b95f7c0680e4142284cf8b22c14a476e87d61b004a3a0861872b32ef7ead40a2"
dependencies = [
"bit-set",
"regex",
]
[[package]]
name = "fastrand"
version = "2.0.0"
@ -1112,7 +1087,6 @@ dependencies = [
"directories",
"dunce",
"env_logger 0.10.0",
"fancy-regex",
"futures-util",
"glam",
"home",