Skip to content
Snippets Groups Projects
Commit 702f93d3 authored by Craig Tiller's avatar Craig Tiller
Browse files

Fix merge errors

parent 4cc1c35a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
test/core/client_channel/resolvers/sockaddr_resolver_test.c
+ 1
− 1
View file @ 702f93d3
...@@ -49,7 +49,7 @@ typedef struct on_resolution_arg { ...@@ -49,7 +49,7 @@ typedef struct on_resolution_arg {
void on_resolution_cb(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) { void on_resolution_cb(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) {
on_resolution_arg *res = arg; on_resolution_arg *res = arg;
grpc_channel_args_destroy(res->resolver_result); grpc_channel_args_destroy(exec_ctx, res->resolver_result);
} }
static void test_succeeds(grpc_resolver_factory *factory, const char *string) { static void test_succeeds(grpc_resolver_factory *factory, const char *string) {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment