Resolve conflicts

esrlabs · Nov 20, 2024 · 4fbbec2 · 4fbbec2
1 parent ddb0d06
commit 4fbbec2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/application/apps/rustcore/rs-bindings/Cargo.lock b/application/apps/rustcore/rs-bindings/Cargo.lock
diff --git a/application/apps/rustcore/rs-bindings/Cargo.toml b/application/apps/rustcore/rs-bindings/Cargo.toml
@@ -30,6 +30,10 @@ thiserror = "1.0"
 tokio = { version = "1.24", features = ["full"] }
 tokio-util = "0.7"
 uuid = { version = "1.3", features = ["serde", "v4"] }
+proto = { path = "../../protocol/proto" }
+prost = "0.13"
+prost-types = "0.13"
+
 [target.'cfg(unix)'.dependencies]
 tikv-jemallocator = {version = "0.6" , optional = true }
 
@@ -42,7 +46,4 @@ default = []
 # Uses `jemalloc` on Unix-based targets and `mimalloc` on Windows.
 # This feature won't be enabled by default since these allocators aren't well tested as the defaults.
 custom-alloc = ['dep:mimalloc', 'dep:tikv-jemallocator']
-proto = { path = "../../protocol/binding/proto" }
-proto = { path = "../../protocol/proto" }
-prost = "0.13"
-prost-types = "0.13"
+