Fix merge error

1 files changed, 0 insertions, 11 deletions

diff --git a/src/node/ext/call.cc b/src/node/ext/call.cc
index ff6b153c53..ffa9b976b3 100644
--- a/src/node/ext/call.cc
+++ b/src/node/ext/call.cc
@@ -352,14 +352,9 @@ class GetMetadataOp : public Op {
     return scope.Escape(ParseMetadata(&recv_metadata));
   }
 
-<<<<<<< HEAD
-  bool ParseOp(Local<Value> value, grpc_op *out) {
-    out->data.recv_initial_metadata = &recv_metadata;
-=======
   bool ParseOp(Local<Value> value, grpc_op *out,
                shared_ptr<Resources> resources) {
     out->data.recv_initial_metadata.recv_initial_metadata = &recv_metadata;
->>>>>>> 4ffcb2058df96c1fa0a319cd3e5d4aa9358e5bae
     return true;
   }
   bool IsFinalOp() {
@@ -390,14 +385,8 @@ class ReadMessageOp : public Op {
     return scope.Escape(ByteBufferToBuffer(recv_message));
   }
 
-<<<<<<< HEAD
   bool ParseOp(Local<Value> value, grpc_op *out) {
-    out->data.recv_message = &recv_message;
-=======
-  bool ParseOp(Local<Value> value, grpc_op *out,
-               shared_ptr<Resources> resources) {
     out->data.recv_message.recv_message = &recv_message;
->>>>>>> 4ffcb2058df96c1fa0a319cd3e5d4aa9358e5bae
     return true;
   }
   bool IsFinalOp() {