integrate-error

1 year ago · cd3a87b03d
parent 1e5c31f2ae
commit cd3a87b03d
1 changed files with 0 additions and 3 deletions
--- a/src/core/lib/transport/transport.h
+++ b/src/core/lib/transport/transport.h
@ -256,7 +256,6 @@ class CallSpineInterface {
  GRPC_MUST_USE_RESULT virtual absl::nullopt_t Cancel(
      ServerMetadataHandle metadata) = 0;
  virtual Party& party() = 0;
-<<<<<<< HEAD

  // Wrap a promise so that if it returns failure it automatically cancels
  // the rest of the call.
@ -299,8 +298,6 @@ class CallSpineInterface {
      }
    });
  }
-=======
->>>>>>> master
 };

 class CallSpine final : public CallSpineInterface {