resolve conflicts

Signed-off-by: Yu Juncen <yu745514916@live.com>
ti-chi-bot · Feb 20, 2024 · 2544739 · 2544739
1 parent 919e36c
commit 2544739
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 18 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/components/server/src/server.rs b/components/server/src/server.rs
@@ -1181,19 +1181,6 @@ where
         // Backup service.
         let mut backup_worker = Box::new(self.core.background_worker.lazy_build("backup-endpoint"));
         let backup_scheduler = backup_worker.scheduler();
-<<<<<<< HEAD
-        let backup_service =
-            backup::Service::<RocksEngine, ER>::with_router(backup_scheduler, self.router.clone());
-        if servers
-            .server
-            .register_service(create_backup(backup_service))
-            .is_some()
-        {
-            fatal!("failed to register backup service");
-        }
-
-=======
->>>>>>> 956c9f377d (snapshot_backup: enhanced prepare stage (#15946))
         let backup_endpoint = backup::Endpoint::new(
             servers.node.id(),
             engines.engine.clone(),