Fix the missing merge conflict resolution

grpc · Jun 2, 2022 · c71c6ac · c71c6ac
1 parent da8398c
commit c71c6ac
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/stats/stats_test.go b/stats/stats_test.go
@@ -176,17 +176,10 @@ func (s *testServer) StreamingOutputCall(in *testpb.StreamingOutputCallRequest,
 // func, modified as needed, and then started with its startServer method.
 // It should be cleaned up with the tearDown method.
 type test struct {
-<<<<<<< HEAD
-	t                  *testing.T
-	compress           string
-	clientStatsHandler []stats.Handler
-	serverStatsHandler []stats.Handler
-=======
 	t                   *testing.T
 	compress            string
 	clientStatsHandlers []stats.Handler
 	serverStatsHandlers []stats.Handler
->>>>>>> @{-1}
 
 	testServer testgrpc.TestServiceServer // nil means none
 	// srv and srvAddr are set once startServer is called.