Merge remote-tracking branch 'refs/remotes/origin/main' into cmp_diff2

# Conflicts: # gomock/call.go
uber-go · Apr 17, 2024 · 5366b1b · 5366b1b
2 parents 515001f + dd79c7c
commit 5366b1b
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/gomock/controller_test.go b/gomock/controller_test.go
@@ -23,6 +23,7 @@ import (
 	"github.com/google/go-cmp/cmp/cmpopts"
 
 	"go.uber.org/mock/gomock"
+	"github.com/google/go-cmp/cmp/cmpopts"
 )
 
 type ErrorReporter struct {