resolve merge conflicts

This commit is contained in:
Jonatan Czarniecki 2025-06-08 18:05:52 +02:00
commit 5c3be679e2
No known key found for this signature in database
GPG key ID: 8B5FB251A803BDD0
4 changed files with 87 additions and 94 deletions

View file

@ -30,7 +30,7 @@ dotenvy = "0.15"
semver = "1.0"
walkdir = "2.5"
indexmap = { version = "2.6", features = ["serde"] }
zip = "2.2"
zip = "4.0"
notify = "8.0"
# Crypto
@ -41,4 +41,4 @@ rand = "0.9"
axum = { version = "0.8", features = ["ws", "macros", "http2"] }
tower-http = { version = "0.6", features = ["trace"] }
tokio = { version = "1.41", features = ["full"] }
prometheus = { version = "0.13.4", features = ["process"] }
prometheus = { version = "0.14", features = ["process"] }