mirror of
https://forgejo.ellis.link/continuwuation/continuwuity.git
synced 2026-11-14 12:46:49 +00:00
fix: Fix merge problems, update to resolvematrix 0.1.0
This commit is contained in:
6 files changed
+598
-935
No files matched your search
@@ -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}")]
|
||||
|
||||
Reference in new issue
Block a user