resolve conflicts

Signed-off-by: vsoch <vsochat@stanford.edu>
vsoch · Nov 6, 2021 · 62497f1 · 62497f1
1 parent 1458c3c
commit 62497f1
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/lib/spack/spack/cmd/__init__.py b/lib/spack/spack/cmd/__init__.py
@@ -154,11 +154,8 @@ def parse_specs(args, **kwargs):
     concretize = kwargs.get('concretize', False)
     normalize = kwargs.get('normalize', False)
     tests = kwargs.get('tests', False)
-<<<<<<< HEAD
     all_versions = kwargs.get('all_versions', False)
-=======
     reuse = kwargs.get('reuse', False)
->>>>>>> 285548588f533338cc5493a7ba492f107e714794
 
     try:
         sargs = args