From 7e73f8c2d8f46f9ea3491a897345047bed7a0ea0 Mon Sep 17 00:00:00 2001
From: Ken Payson <kpayson@google.com>
Date: Tue, 11 Oct 2016 12:55:40 -0700
Subject: [PATCH] Changes

---
 src/core/lib/iomgr/ev_poll_cv_posix.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/core/lib/iomgr/ev_poll_cv_posix.h b/src/core/lib/iomgr/ev_poll_cv_posix.h
index ff667a54c2c..885711d1c52 100644
--- 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;