error enum cleanup

Signed-off-by: Jason Volk <jason@zemos.net>
2024-06-14 18:29:21 +00:00
parent fbcdb3860a
commit a6edaad6fc
4 changed files with 54 additions and 67 deletions
--- a/src/core/Cargo.toml
+++ b/src/core/Cargo.toml
@@ -63,13 +63,6 @@ regex.workspace = true
 reqwest.workspace = true
 ring.workspace = true
 ruma.workspace = true
-<<<<<<< HEAD
-rust-rocksdb.optional = true
-rust-rocksdb.workspace = true
-=======
-rusqlite.optional = true
-rusqlite.workspace = true
->>>>>>> 6963b38f (convert rocksdb errors locally; remove from Error.)
 sanitize-filename.workspace = true
 serde_json.workspace = true
 serde_regex.workspace = true