fixed merge conflict
This commit is contained in:
@@ -47,6 +47,8 @@ tokio-postgres = "0.7.8" # Async PostgreSQL client
|
||||
tokio-test = "0.4.4"
|
||||
uuid = { version = "1.16.0", features = ["v4"] }
|
||||
zinit-client = { git = "https://github.com/threefoldtech/zinit", branch = "json_rpc", package = "zinit-client" }
|
||||
reqwest = { version = "0.12.15", features = ["json"] }
|
||||
|
||||
# Optional features for specific OS functionality
|
||||
[target.'cfg(unix)'.dependencies]
|
||||
nix = "0.30.1" # Unix-specific functionality
|
||||
|
Reference in New Issue
Block a user