fix: Fix merge problems, update to resolvematrix 0.1.0

This commit is contained in:
theS1LV3R committed 2026-07-03 10:59:12 +02:00
1 parent 0a12d40625
commit 5b5ba53980
6 files changed
+598 -935

No files matched your search

+1 -1
View File
@@ -88,7 +88,7 @@ pub enum Error {
#[error(transparent)]
YamlSer(#[from] serde_saphyr::ser_error::Error),
#[error(transparent)]
ResolveServer(#[from] resolvematrix::server::ResolveServerError),
ResolveServer(#[from] resolvematrix::error::ResolveServerError),
// ruma/conduwuit
#[error("Arithmetic operation failed: {0}")]