Really fix merge issues

FNALssi · Oct 24, 2023 · 818c671 · 818c671
1 parent 5379f2d
commit 818c671
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/lib/spack/spack/cmd/buildcache.py b/lib/spack/spack/cmd/buildcache.py
@@ -34,11 +34,7 @@
 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"