From be5a4ebb76fa218ff516895fbe77f8a8c1e38485 Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Tue, 15 Dec 2015 08:12:44 -0800
Subject: [PATCH] Fix merge error
---
src/core/transport/chttp2/internal.h | 3 ---
1 file changed, 3 deletions(-)
diff --git a/src/core/transport/chttp2/internal.h b/src/core/transport/chttp2/internal.h
index 8bcb440c36..43b3adb9d3 100644
--- a/src/core/transport/chttp2/internal.h
+++ b/src/core/transport/chttp2/internal.h
@@ -284,9 +284,6 @@ struct grpc_chttp2_transport_parsing {
gpr_slice goaway_text;
gpr_int64 outgoing_window;
-
- /** pings awaiting responses */
- grpc_chttp2_outstanding_ping pings;
};
struct grpc_chttp2_transport {
--
GitLab