Skip to content

Commit

Permalink
fix conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
TCeason committed Sep 3, 2024
1 parent 5475817 commit cf9931a
Showing 1 changed file with 0 additions and 13 deletions.
13 changes: 0 additions & 13 deletions src/meta/app/src/app_error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1168,29 +1168,16 @@ pub enum AppError {
),

#[error(transparent)]
<<<<<<< HEAD
UnknownDictionary(
#[from] UnknownError<dictionary_name_ident::DictionaryNameRsc, DictionaryIdentity>,
),

// Procedure
#[error(transparent)]
UnknownProcedure(#[from] UnknownProcedure),

#[error(transparent)]
ProcedureAlreadyExists(#[from] ProcedureAlreadyExists),
=======
UnknownDictionary(#[from] UnknownDictionary),
<<<<<<< HEAD
>>>>>>> 16f088a754 (refactor procedure mgr: use DataId)
=======

#[error(transparent)]
ProcedureAlreadyExists(#[from] ExistError<procedure_name_ident::ProcedureName>),

#[error(transparent)]
UnknownProcedure(#[from] UnknownError<procedure_name_ident::ProcedureName>),
>>>>>>> 6cec315b7f (remove ProcedureIdList, refactor procedure_mgr)
}

impl AppError {
Expand Down

0 comments on commit cf9931a

Please sign in to comment.