From b62bc90cecad988aacceb131775495e507e647f4 Mon Sep 17 00:00:00 2001 From: Lidi Zheng Date: Wed, 29 Jan 2020 09:57:19 -0800 Subject: [PATCH] Update tests.json --- src/python/grpcio_tests/tests_aio/tests.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/python/grpcio_tests/tests_aio/tests.json b/src/python/grpcio_tests/tests_aio/tests.json index 1f6ae2c764c..ba9c2059079 100644 --- a/src/python/grpcio_tests/tests_aio/tests.json +++ b/src/python/grpcio_tests/tests_aio/tests.json @@ -16,10 +16,6 @@ "unit.interceptor_test.TestUnaryUnaryClientInterceptor", "unit.metadata_test.TestMetadata", "unit.server_test.TestServer", -<<<<<<< HEAD "unit.timeout_test.TestTimeout", "unit.wait_for_ready_test.TestWaitForReady" -======= - "unit.timeout_test.TestTimeout" ->>>>>>> Fix the json ]