diff options
Diffstat (limited to 'test/core/end2end/fixtures/chttp2_fullstack.c')
| -rw-r--r-- | test/core/end2end/fixtures/chttp2_fullstack.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/test/core/end2end/fixtures/chttp2_fullstack.c b/test/core/end2end/fixtures/chttp2_fullstack.c index 820b958f32..b83e227a89 100644 --- a/test/core/end2end/fixtures/chttp2_fullstack.c +++ b/test/core/end2end/fixtures/chttp2_fullstack.c @@ -82,12 +82,8 @@ void chttp2_init_server_fullstack(grpc_end2end_test_fixture *f, if (f->server) { grpc_server_destroy(f->server); } -<<<<<<< HEAD - f->server = grpc_server_create(f->cq, server_args); -======= f->server = grpc_server_create(server_args); - grpc_server_register_completion_queue(f->server, f->server_cq); ->>>>>>> b122e2ec9ff9c32b9ced1efbc02a06bc64178d9f + grpc_server_register_completion_queue(f->server, f->cq); GPR_ASSERT(grpc_server_add_http2_port(f->server, ffd->localaddr)); grpc_server_start(f->server); } |