Fix merge issue

FNALssi · Oct 23, 2023 · c2d964d · c2d964d
1 parent 847b1bd
commit c2d964d
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 14 deletions.
diff --git a/lib/spack/spack/cmd/buildcache.py b/lib/spack/spack/cmd/buildcache.py
@@ -34,11 +34,6 @@
 from spack.cmd import display_specs
 from spack.spec import Spec, save_dependency_specfiles
 from spack.stage import Stage
-<<<<<<< HEAD
-from spack.util.pattern import Args
-from spack.util.string import plural
-=======
->>>>>>> develop
 
 description = "create, download and install binary packages"
 section = "packaging"

diff --git a/lib/spack/spack/cmd/create.py b/lib/spack/spack/cmd/create.py
@@ -876,16 +876,7 @@ def get_versions(args, name):
             url_dict = {version: args.url}
 
         version_hashes = spack.stage.get_checksums_for_versions(
-<<<<<<< HEAD
-            url_dict,
-            name,
-            first_stage_function=guesser,
-            keep_stage=args.keep_stage,
-            batch=(args.batch or len(url_dict) == 1 or args.limit > 0),
-            limit=args.limit,
-=======
             url_dict, name, first_stage_function=guesser, keep_stage=args.keep_stage
->>>>>>> develop
         )
 
         versions = get_version_lines(version_hashes, url_dict)