Merge branch main

googleapis · Sep 5, 2023 · 070f6d8 · 070f6d8
1 parent 27f77f9
commit 070f6d8
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/tests/test_testbench_retry.py b/tests/test_testbench_retry.py
@@ -577,14 +577,11 @@ def setUp(self):
         self.rest_client = rest_server.server.test_client()
         self.grpc = testbench.grpc_server.StorageServicer(self.db)
 
-<<<<<<< HEAD
     @staticmethod
     def _create_block(desired_kib):
         line = "A" * 127 + "\n"
         return int(desired_kib / len(line)) * line
 
-=======
->>>>>>> f929482812c6eb259df210a9b259099856922f57
     def test_grpc_retry_return_error(self):
         # Use the rest client to setup a 503 failure for retrieving bucket metadata.
         response = self.rest_client.post(