Hotfix - git merge conflict

This commit is contained in:
Billy Chan 2021-09-01 22:04:43 +08:00
parent ab7e7f3401
commit 23f2a3d711
No known key found for this signature in database
GPG Key ID: A2D690CAC7DF3CC7

View File

@ -18,7 +18,7 @@ pub(crate) enum QueryResultRow {
} }
pub trait TryGetable: Sized { pub trait TryGetable: Sized {
fn try_get(res: &QueryResult, pre: &str, col: &str) -> Result<Self, DbErr>; fn try_get(res: &QueryResult, pre: &str, col: &str) -> Result<Self, TryGetError>;
} }
pub enum TryGetError { pub enum TryGetError {