From 8c6631fb49a3c887594fbdef75e0282fad17be72 Mon Sep 17 00:00:00 2001
From: 3pointer <luancheng@pingcap.com>
Date: Thu, 13 May 2021 17:47:37 +0800
Subject: [PATCH] Update run_services

---
 tests/_utils/run_services | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tests/_utils/run_services b/tests/_utils/run_services
index a0cde931b..ad39b2f77 100644
--- a/tests/_utils/run_services
+++ b/tests/_utils/run_services
@@ -48,11 +48,8 @@ stop_services() {
     for svc in "br" "tidb-server" "tiflash" "TiFlashMain" "tikv-server" "pd-server" "cdc" "minio" "tikv-importer"; do
         stop $svc &
     done
-<<<<<<< HEAD
-=======
     sleep 2 # give some time for the OS to reap all processes
     lsof -n -P -i :2379 -i :4000 -i :10080 -i :20161 -i :20162 -i :20163 -i :20181 -i :20182 -i :20183 -i :17000 -i :8125 || true
->>>>>>> 264059b7... backup: allow backup tolerate minor TiKV failure (#997) (#1019)
 }
 
 start_services() {