sync with dev-version-5

th2-net · Nov 13, 2023 · 672f098 · 672f098
1 parent 49ecdb6
commit 672f098
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/src/test/kotlin/com/exactpro/th2/common/schema/grpc/router/impl/DefaultGrpcRouterTest.kt b/src/test/kotlin/com/exactpro/th2/common/schema/grpc/router/impl/DefaultGrpcRouterTest.kt
@@ -289,13 +289,6 @@ internal class DefaultGrpcRouterTest {
             )
         }
 
-<<<<<<< HEAD
-        /* FIXME: this test sometimes failing with TimeoutException
-             Suppressed: java.lang.IllegalStateException: 'Executor' can't be stopped
-             at shutdownGracefully (DefaultGrpcRouterTest.kt:718)
-        */
-=======
->>>>>>> dev-version-5
         @Test
         override fun `server terminated intermediate session (retry true)`() {
             val clientServerBaton = Baton("client-server")