From 641f8936b32eecca459ca4c2c422886d7e90c397 Mon Sep 17 00:00:00 2001
From: Cyril Moineau <cyril.moineau@cea.fr>
Date: Thu, 25 Apr 2024 10:06:10 +0000
Subject: [PATCH] Apply 1 suggestion(s) to 1 file(s)
---
aidge_core/export/code_generation.py | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/aidge_core/export/code_generation.py b/aidge_core/export/code_generation.py
index 04eecaf69..b18b5476f 100644
--- a/aidge_core/export/code_generation.py
+++ b/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
--
GitLab