fix conflict

This commit is contained in:
Chieh Wang
2022-12-08 18:51:20 +08:00
committed by Asura
parent 95775678ca
commit 49bcf8f794
6 changed files with 114 additions and 84 deletions

2
Cargo.lock generated
View File

@@ -4229,7 +4229,7 @@ dependencies = [
[[package]]
name = "rdev"
version = "0.5.0-2"
source = "git+https://github.com/asur4s/rdev#fdcee04f10ea0ef00d36aa612eabb9605ae9f2fc"
source = "git+https://github.com/asur4s/rdev#4051761e7ccf434a443b8e9592c23160c9cace56"
dependencies = [
"cocoa",
"core-foundation 0.9.3",