From 38cc6386db3284b1e91a99cfc1223b089a29c5fb Mon Sep 17 00:00:00 2001 From: dsinghvi Date: Tue, 17 Sep 2024 15:45:10 -0400 Subject: [PATCH] remove conflict --- .../src/fern_python/pydantic_codegen/pydantic_model.py | 9 --------- 1 file changed, 9 deletions(-) diff --git a/generators/python/src/fern_python/pydantic_codegen/pydantic_model.py b/generators/python/src/fern_python/pydantic_codegen/pydantic_model.py index 462439e5df9..8c92958ded6 100644 --- a/generators/python/src/fern_python/pydantic_codegen/pydantic_model.py +++ b/generators/python/src/fern_python/pydantic_codegen/pydantic_model.py @@ -370,21 +370,12 @@ def update_forward_refs_for_given_model(self, given_model: AST.ClassReference) - AST.FunctionInvocation( function_definition=self._update_forward_ref_function_reference, args=[AST.Expression(given_model)], -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> f954501385 (update snaps) kwargs=[ ( get_named_import_or_throw(self._local_class_reference), AST.Expression(self._local_class_reference), ) ], -<<<<<<< HEAD -======= ->>>>>>> 30dc3ebe9d (working, need to polish) -======= ->>>>>>> f954501385 (update snaps) ) ) )