Fix format

XuanWang-Amos · Feb 16, 2024 · c00bb5e · c00bb5e
1 parent f23733a
commit c00bb5e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 22 deletions.
diff --git a/examples/python/helloworld/helloworld_pb2.py b/examples/python/helloworld/helloworld_pb2.py
diff --git a/examples/python/helloworld/helloworld_pb2_grpc.py b/examples/python/helloworld/helloworld_pb2_grpc.py
@@ -126,7 +126,6 @@ def SayHello(request,
             '/helloworld.Greeter/SayHello',
             helloworld__pb2.HelloRequest.SerializeToString,
             helloworld__pb2.HelloReply.FromString,
-<<<<<<< HEAD
             options,
             channel_credentials,
             insecure,
@@ -136,10 +135,6 @@ def SayHello(request,
             timeout,
             metadata,
             _registered_method=True)
-=======
-            options, channel_credentials,
-            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
->>>>>>> 198f30155b ([Python Stub] Add version check to stubs)
 
     @staticmethod
     def SayHelloStreamReply(request,
@@ -152,7 +147,6 @@ def SayHelloStreamReply(request,
             wait_for_ready=None,
             timeout=None,
             metadata=None):
-<<<<<<< HEAD
         return grpc.experimental.unary_stream(
             request,
             target,
@@ -168,13 +162,6 @@ def SayHelloStreamReply(request,
             timeout,
             metadata,
             _registered_method=True)
-=======
-        return grpc.experimental.unary_stream(request, target, '/helloworld.Greeter/SayHelloStreamReply',
-            helloworld__pb2.HelloRequest.SerializeToString,
-            helloworld__pb2.HelloReply.FromString,
-            options, channel_credentials,
-            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
->>>>>>> 198f30155b ([Python Stub] Add version check to stubs)
 
     @staticmethod
     def SayHelloBidiStream(request_iterator,
@@ -187,7 +174,6 @@ def SayHelloBidiStream(request_iterator,
             wait_for_ready=None,
             timeout=None,
             metadata=None):
-<<<<<<< HEAD
         return grpc.experimental.stream_stream(
             request_iterator,
             target,
@@ -203,10 +189,3 @@ def SayHelloBidiStream(request_iterator,
             timeout,
             metadata,
             _registered_method=True)
-=======
-        return grpc.experimental.stream_stream(request_iterator, target, '/helloworld.Greeter/SayHelloBidiStream',
-            helloworld__pb2.HelloRequest.SerializeToString,
-            helloworld__pb2.HelloReply.FromString,
-            options, channel_credentials,
-            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
->>>>>>> 198f30155b ([Python Stub] Add version check to stubs)