remove missed conflict

ankona · Oct 21, 2024 · 081d5ca · 081d5ca
1 parent 2d6c35d
commit 081d5ca
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/smartsim/_core/_cli/build.py b/smartsim/_core/_cli/build.py
@@ -167,13 +167,6 @@ def execute(
     is_dragon_requested = args.dragon
     dragon_repo = args.dragon_repo
     dragon_version = args.dragon_version
-<<<<<<< HEAD
-=======
-
-    if Path(CONFIG.build_path).exists():
-        logger.warning(f"Build path already exists, removing: {CONFIG.build_path}")
-        shutil.rmtree(CONFIG.build_path)
->>>>>>> v1.0
 
     # The user should never have to specify the OS and Architecture
     current_platform = Platform(