aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar David Garcia Quintas <dgq@google.com>2015-04-29 16:22:09 -0700
committerGravatar David Garcia Quintas <dgq@google.com>2015-04-29 16:22:09 -0700
commit7af45f2821504f19244140d4ea9bf69e5d6bf67c (patch)
tree5146bc0ed99bfcd0738f89c5a96f5ee0e9a4c20f
parent5f9f4556820b7a442263839fbc706ff624eb321b (diff)
Fixed bad merge on basic_timers.c
-rw-r--r--src/core/profiling/basic_timers.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/core/profiling/basic_timers.c b/src/core/profiling/basic_timers.c
index 7ad67f4831..8dd944cd36 100644
--- a/src/core/profiling/basic_timers.c
+++ b/src/core/profiling/basic_timers.c
@@ -47,7 +47,6 @@
typedef struct grpc_timer_entry {
grpc_precise_clock tm;
- int tag;
gpr_thd_id thd;
int tag;
void* id;