From 7108f53e2fe51e41b805303b2b82bbd0274da982 Mon Sep 17 00:00:00 2001
From: 3pointer <luancheng@pingcap.com>
Date: Mon, 13 Jan 2025 14:25:59 +0800
Subject: [PATCH] fix test

---
 br/tests/br_pitr/run.sh | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/br/tests/br_pitr/run.sh b/br/tests/br_pitr/run.sh
index 52585aed38f72..b9068db6f558f 100644
--- a/br/tests/br_pitr/run.sh
+++ b/br/tests/br_pitr/run.sh
@@ -112,12 +112,7 @@ fi
 # PITR restore
 echo "run pitr"
 run_sql "DROP DATABASE __TiDB_BR_Temporary_Log_Restore_Checkpoint;"
-<<<<<<< HEAD
 run_br --pd $PD_ADDR restore point -s "local://$TEST_DIR/$PREFIX/log" --full-backup-storage "local://$TEST_DIR/$PREFIX/full" > $res_file 2>&1
-=======
-run_sql "DROP DATABASE __TiDB_BR_Temporary_Custom_SST_Restore_Checkpoint;"
-run_br --pd $PD_ADDR restore point -s "local://$TEST_DIR/$PREFIX/log" --full-backup-storage "local://$TEST_DIR/$PREFIX/full" > $res_file 2>&1 || ( cat $res_file && exit 1 )
->>>>>>> 384f858a6c8 (br/stream: allow pitr to create oversized indices (#58433))
 
 check_result