solve conflict

aidge_export_arm_cortexm/export.py

@@ -38,12 +38,8 @@ def supported_boards() -> list[str]:
 
 def gen_board_files(path:str, board:str)->None:
     if board not in supported_boards():
-<<<<<<< HEAD
-        raise ValueError(f"Board {board} is not supported, supported board are:{supported_boards()}")
-=======
         joint_board_str = "\n\t-".join(supported_boards())
         raise ValueError(f"Board {board} is not supported, supported board are:\n\t-{joint_board_str}")
->>>>>>> dev
 
     if isinstance(path, str): path = Path(path)
     # Create dnn directory is not exist
@@ -55,9 +51,3 @@ def gen_board_files(path:str, board:str)->None:
 
     # Copy all static files in the export
     shutil.copytree(BOARDS_MAP[board], str(path), dirs_exist_ok=True)
-<<<<<<< HEAD
-    # For N2D2 library, copy static folder to export/include
-    dnn_include_folder = dnn_folder / "include"
-    os.makedirs(str(dnn_include_folder), exist_ok=True)
-=======
->>>>>>> dev