Apply 1 suggestion(s) to 1 file(s)

aidge_core/export/code_generation.py

@@ -4,11 +4,8 @@ from jinja2 import Environment, FileSystemLoader
 
 def generate_file(file_path: str, template_path: str, **kwargs) -> None:
     """Generate a file at `file_path` using the jinja template located at `file_path`.
-<<<<<<< HEAD
-    kwargs are used to fill the template
-=======
-    kwargs are used
->>>>>>> e5b8f1402253295b15ba2834b523b44a42633b8b
+
+    kwargs are used to fill the template.
 
     :param file_path: path where to generate the file
     :type file_path: str