From d1a7ecc1ad59a035abd0cdb96d0343df6d132f67 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Fri, 29 May 2015 14:05:00 -0700 Subject: [PATCH] Fix tests --- .../fixtures/chttp2_simple_ssl_fullstack_with_poll.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/test/core/end2end/fixtures/chttp2_simple_ssl_fullstack_with_poll.c b/test/core/end2end/fixtures/chttp2_simple_ssl_fullstack_with_poll.c index 6eec6496d76..77c057df2c5 100644 --- a/test/core/end2end/fixtures/chttp2_simple_ssl_fullstack_with_poll.c +++ b/test/core/end2end/fixtures/chttp2_simple_ssl_fullstack_with_poll.c @@ -85,14 +85,8 @@ static void chttp2_init_server_secure_fullstack( grpc_server_destroy(f->server); } f->server = grpc_server_create(server_args); -<<<<<<< HEAD grpc_server_register_completion_queue(f->server, f->cq); GPR_ASSERT(grpc_server_add_secure_http2_port(f->server, ffd->localaddr, server_creds)); -======= - grpc_server_register_completion_queue(f->server, f->server_cq); - GPR_ASSERT(grpc_server_add_secure_http2_port(f->server, ffd->localaddr, - server_creds)); ->>>>>>> 8f17c6c0283aeb78b615580529e98f1a28bf3c77 grpc_server_credentials_release(server_creds); grpc_server_start(f->server); }