Update run.sh

pingcap · Aug 9, 2022 · c9ac36d · c9ac36d
1 parent d9348fb
commit c9ac36d
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/dm/tests/shardddl2/run.sh b/dm/tests/shardddl2/run.sh
@@ -304,11 +304,7 @@ function DM_DROP_COLUMN_EXEC_ERROR() {
 function DM_DROP_COLUMN_ALL_DONE_CASE() {
 	# get worker of source2
 	w="1"
-<<<<<<< HEAD
-	got=$(grep "mysql-replica-01" $WORK_DIR/worker1/log/dm-worker.log | wc -l)
-=======
 	got=$(grep -a "mysql-replica-02" $WORK_DIR/worker1/log/dm-worker.log | wc -l)
->>>>>>> 1e7b84040 (test(dm): inject error to a not-auto-resume source (#6624))
 	if [[ "$got" -eq 0 ]]; then
 		w="2"
 	fi