Skip to content

Commit cecb8dc

Browse files
committed
[BUG](worker): Resolve hotfix merge markers
1 parent ad9e026 commit cecb8dc

1 file changed

Lines changed: 0 additions & 4 deletions

File tree

rust/worker/src/execution/orchestration/function_execution.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
1-
<<<<<<< HEAD
21
use std::cell::OnceCell;
32

4-
use chroma_error::source_chain_contains;
5-
=======
63
use chroma_error::{source_chain_contains, ChromaError};
7-
>>>>>>> 4088bf614 ([BUG](worker): Find purged fetch errors (#7490))
84
use chroma_log::grpc_log::GrpcPullLogsError;
95
use chroma_system::System;
106
use chroma_types::{AttachedFunction, AttachedFunctionUuid, CollectionUuid, DatabaseName};

0 commit comments

Comments
 (0)