Fix merge conflict

AdrienVannson · AdrienVannson · commit 2e7d92ff89d3 · 2025-01-22T14:30:12.000+01:00
diff --git a/src/betterproto2_compiler/templates/template.py.j2 b/src/betterproto2_compiler/templates/template.py.j2
@@ -106,11 +106,7 @@ class {{ service.py_name }}Stub(betterproto2.ServiceStub):
                 {%- endif -%}
         {%- else -%}
             {# Client streaming: need a request iterator instead #}
-<<<<<<< HEAD
-            , messages: "{{ output_file.settings.typing_compiler.union(output_file.settings.typing_compiler.async_iterable(method.py_input_message_type), output_file.settings.typing_compiler.iterable(method.py_input_message_type)) }}"
-=======
-            , {{ method.py_input_message_param }}_iterator: "AsyncIterable[{{ method.py_input_message_type }}] | Iterable[{{ method.py_input_message_type }}]"
->>>>>>> b85a5cc (Remove typing compiler)
+            , message: "AsyncIterable[{{ method.py_input_message_type }}] | Iterable[{{ method.py_input_message_type }}]"
         {%- endif -%}
             ,
             *

Original file line number	Diff line number	Diff line change
`@@ -106,11 +106,7 @@ class {{ service.py_name }}Stub(betterproto2.ServiceStub):`
`106`	`106`	`{%- endif -%}`
`107`	`107`	`{%- else -%}`
`108`	`108`	`{# Client streaming: need a request iterator instead #}`
`109`		`-<<<<<<< HEAD`
`110`		`- , messages: "{{ output_file.settings.typing_compiler.union(output_file.settings.typing_compiler.async_iterable(method.py_input_message_type), output_file.settings.typing_compiler.iterable(method.py_input_message_type)) }}"`
`111`		`-=======`
`112`		`- , {{ method.py_input_message_param }}_iterator: "AsyncIterable[{{ method.py_input_message_type }}] \| Iterable[{{ method.py_input_message_type }}]"`
`113`		`->>>>>>> b85a5cc (Remove typing compiler)`
	`109`	`+ , message: "AsyncIterable[{{ method.py_input_message_type }}] \| Iterable[{{ method.py_input_message_type }}]"`
`114`	`110`	`{%- endif -%}`
`115`	`111`	`,`
`116`	`112`	`*`