Changes

8 years ago · 7e73f8c2d8
parent 895e8ca2d7
commit 7e73f8c2d8
1 changed files with 0 additions and 3 deletions
--- a/src/core/lib/iomgr/ev_poll_cv_posix.h
+++ b/src/core/lib/iomgr/ev_poll_cv_posix.h
@ -54,12 +54,9 @@ typedef struct fd_node {

 typedef struct cv_fd_table {
  gpr_mu mu;
-<<<<<<< HEAD
-=======
  int pollcount;
  int shutdown;
  gpr_cv shutdown_complete;
->>>>>>> d195cf589d3f03b4f08017f3e2885c2c2fff125b
  fd_node* cvfds;
  fd_node* free_fds;
  unsigned int size;