kryddan/gantry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed merge conflict on imports

Browse Source
This commit is contained in:
Adam 2025-03-28 17:16:05 +01:00
parent 4ea39b4333
commit acd2df6112
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/gantry.py
View File

@ -1,22 +1,14 @@
import typer import typer
import os import os
<<<<<<< HEAD
from re import split from re import split
from project_man import findProjectFile, getLibraryInProject, initProjectFile, addLibraryInProject, removeLibraryInProject, getLibrariesPresent from project_man import findProjectFile, getLibraryInProject, initProjectFile, addLibraryInProject, removeLibraryInProject, getLibrariesPresent, findProjectRoot, getProjectDict, getLibrariesInProject, findProjectFile, getLibraryInProject, getSourceFilesWithLib, 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)
import elab as elaborate import elab as elaborate
import build_env import build_env
from typing import List, Optional from typing import List, Optional
from typing_extensions import Annotated from typing_extensions import Annotated
import subprocess import subprocess
<<<<<<< HEAD
gantry_install_path = "/home/thesis1/repos/gantry/src"
=======
gantry_install_path = "/home/thesis2/gantry/src" gantry_install_path = "/home/thesis2/gantry/src"
>>>>>>> 8bf7864 (Added library support for nxp_script)
app = typer.Typer() app = typer.Typer()