fixed merge conflict

This commit is contained in:
Maxime Van Hees
2025-05-13 10:20:08 +02:00
parent a4438d63e0
commit 3417e2c1ff
6 changed files with 654 additions and 0 deletions

View File

@@ -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