From acd2df6112afaec84d3a87b18785c6e225a66f61 Mon Sep 17 00:00:00 2001 From: Adam Date: Fri, 28 Mar 2025 17:16:05 +0100 Subject: [PATCH] Fixed merge conflict on imports --- src/gantry.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/gantry.py b/src/gantry.py index 3e8a526..fcc0de4 100644 --- a/src/gantry.py +++ b/src/gantry.py @@ -1,22 +1,14 @@ import typer import os -<<<<<<< HEAD from re import split -from project_man import findProjectFile, getLibraryInProject, initProjectFile, addLibraryInProject, removeLibraryInProject, getLibrariesPresent -======= -from project_man import findProjectRoot, getProjectDict, getLibrariesInProject, findProjectFile, getLibraryInProject, getSourceFilesWithLib, initProjectFile, addLibraryInProject, removeLibraryInProject, getLibrariesPresent ->>>>>>> 8bf7864 (Added library support for nxp_script) +from project_man import findProjectFile, getLibraryInProject, initProjectFile, addLibraryInProject, removeLibraryInProject, getLibrariesPresent, findProjectRoot, getProjectDict, getLibrariesInProject, findProjectFile, getLibraryInProject, getSourceFilesWithLib, initProjectFile, addLibraryInProject, removeLibraryInProject, getLibrariesPresent import elab as elaborate import build_env from typing import List, Optional from typing_extensions import Annotated import subprocess -<<<<<<< HEAD -gantry_install_path = "/home/thesis1/repos/gantry/src" -======= gantry_install_path = "/home/thesis2/gantry/src" ->>>>>>> 8bf7864 (Added library support for nxp_script) app = typer.Typer()