resolved conflicts

Signed-off-by: Neil Shen <[email protected]>
pingcap · Dec 10, 2021 · 2fc8dde · 2fc8dde
1 parent fd0a8ba
commit 2fc8dde
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/pkg/workerpool/pool_test.go b/pkg/workerpool/pool_test.go
@@ -25,6 +25,7 @@ import (
 	"github.com/pingcap/failpoint"
 	"github.com/pingcap/log"
 	"github.com/pingcap/ticdc/pkg/util/testleak"
+	"github.com/stretchr/testify/require"
 	"go.uber.org/zap"
 	"golang.org/x/sync/errgroup"
 	"golang.org/x/time/rate"