fix conflict

databendlabs · Sep 3, 2024 · cf9931a · cf9931a
1 parent 5475817
commit cf9931a
Showing 1 changed file with 0 additions and 13 deletions.
diff --git a/src/meta/app/src/app_error.rs b/src/meta/app/src/app_error.rs
@@ -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 {