br: fix merge conflict (#36775)

ref #36651
pingcap · Aug 1, 2022 · 137041a · 137041a
1 parent 4970ee8
commit 137041a
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/br/tests/br_split_region_fail/run.sh b/br/tests/br_split_region_fail/run.sh
@@ -45,15 +45,9 @@ done
 echo "restore start..."
 
 unset BR_LOG_TO_TERM
-<<<<<<< HEAD
 GO_FAILPOINTS="github.com/pingcap/tidb/br/pkg/restore/not-leader-error=1*return(true)->1*return(false);\
 github.com/pingcap/tidb/br/pkg/restore/somewhat-retryable-error=3*return(true)" \
-run_br restore full --filter '*.*' --filter '!mysql.*' -s "local://$TEST_DIR/$DB" --pd $PD_ADDR --ratelimit 1024 --log-file $LOG || true
-=======
-GO_FAILPOINTS="github.com/pingcap/tidb/br/pkg/restore/split/not-leader-error=1*return(true)->1*return(false);\
-github.com/pingcap/tidb/br/pkg/restore/split/somewhat-retryable-error=3*return(true)" \
 run_br restore full -s "local://$TEST_DIR/$DB" --pd $PD_ADDR --ratelimit 1024 --log-file $LOG || true
->>>>>>> cb211e0ed... br: add flag to control whether restore priv table on default (#36652)
 BR_LOG_TO_TERM=1
 
 grep "a error occurs on split region" $LOG && \