Fix broken merge

yang-g · Apr 19, 2017 · 0dd38b5 · 0dd38b5
1 parent cac4e17
commit 0dd38b5
Showing 1 changed file with 3 additions and 29 deletions.
diff --git a/src/node/ext/call.cc b/src/node/ext/call.cc
@@ -248,13 +248,9 @@ class SendMessageOp : public Op {
     out->data.send_message.send_message = send_message;
     return true;
   }
-<<<<<<< HEAD
-  bool IsFinalOp() { return false; }
 
-=======
   bool IsFinalOp() { return false; }
   void OnComplete(bool success) {}
->>>>>>> e412a180602753972ac496560322e224a5db987f
 
  protected:
   std::string GetTypeString() const { return "send_message"; }
@@ -269,15 +265,10 @@ class SendClientCloseOp : public Op {
     EscapableHandleScope scope;
     return scope.Escape(Nan::True());
   }
-<<<<<<< HEAD
-  bool ParseOp(Local<Value> value, grpc_op *out) { return true; }
-  bool IsFinalOp() { return false; }
 
-=======
   bool ParseOp(Local<Value> value, grpc_op *out) { return true; }
   bool IsFinalOp() { return false; }
   void OnComplete(bool success) {}
->>>>>>> e412a180602753972ac496560322e224a5db987f
 
  protected:
   std::string GetTypeString() const { return "client_close"; }
@@ -341,13 +332,9 @@ class SendServerStatusOp : public Op {
     out->data.send_status_from_server.status_details = &this->details;
     return true;
   }
-<<<<<<< HEAD
-  bool IsFinalOp() { return true; }
 
-=======
   bool IsFinalOp() { return true; }
   void OnComplete(bool success) {}
->>>>>>> e412a180602753972ac496560322e224a5db987f
 
  protected:
   std::string GetTypeString() const { return "send_status"; }
@@ -372,12 +359,9 @@ class GetMetadataOp : public Op {
     out->data.recv_initial_metadata.recv_initial_metadata = &recv_metadata;
     return true;
   }
-<<<<<<< HEAD
-  bool IsFinalOp() { return false; }
-=======
+
   bool IsFinalOp() { return false; }
   void OnComplete(bool success) {}
->>>>>>> e412a180602753972ac496560322e224a5db987f
 
  protected:
   std::string GetTypeString() const { return "metadata"; }
@@ -403,12 +387,9 @@ class ReadMessageOp : public Op {
     out->data.recv_message.recv_message = &recv_message;
     return true;
   }
-<<<<<<< HEAD
-  bool IsFinalOp() { return false; }
-=======
+
   bool IsFinalOp() { return false; }
   void OnComplete(bool success) {}
->>>>>>> e412a180602753972ac496560322e224a5db987f
 
  protected:
   std::string GetTypeString() const { return "read"; }
@@ -441,13 +422,9 @@ class ClientStatusOp : public Op {
              ParseMetadata(&metadata_array));
     return scope.Escape(status_obj);
   }
-<<<<<<< HEAD
-  bool IsFinalOp() { return true; }
 
-=======
   bool IsFinalOp() { return true; }
   void OnComplete(bool success) {}
->>>>>>> e412a180602753972ac496560322e224a5db987f
 
  protected:
   std::string GetTypeString() const { return "status"; }
@@ -469,12 +446,9 @@ class ServerCloseResponseOp : public Op {
     out->data.recv_close_on_server.cancelled = &cancelled;
     return true;
   }
-<<<<<<< HEAD
-  bool IsFinalOp() { return false; }
-=======
+
   bool IsFinalOp() { return false; }
   void OnComplete(bool success) {}
->>>>>>> e412a180602753972ac496560322e224a5db987f
 
  protected:
   std::string GetTypeString() const { return "cancelled"; }