aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar Craig Tiller <ctiller@google.com>2015-12-15 08:12:44 -0800
committerGravatar Craig Tiller <ctiller@google.com>2015-12-15 08:12:44 -0800
commitbe5a4ebb76fa218ff516895fbe77f8a8c1e38485 (patch)
treeea7659a606adb73627c497cd445d024dc077236e /src
parentabb2e3dc00da63431b22696145bde3538132ebd8 (diff)
Fix merge error
Diffstat (limited to 'src')
-rw-r--r--src/core/transport/chttp2/internal.h3
1 files changed, 0 insertions, 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 {