From 6e1cb271ddbefe590eccf60f1e6f766eafe05a7e Mon Sep 17 00:00:00 2001
From: Guilherme Lima <lima@fnal.gov>
Date: Fri, 3 Jan 2025 18:55:15 -0600
Subject: [PATCH] Fix leftover from a merge conflict

---
 .github/workflows/build-spack.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/build-spack.yml b/.github/workflows/build-spack.yml
index 399f0a2f7b..0dfab3d0f8 100644
--- a/.github/workflows/build-spack.yml
+++ b/.github/workflows/build-spack.yml
@@ -183,7 +183,6 @@ jobs:
         if: ${{matrix.special != 'clang-tidy'}}
         working-directory: build
         run: |
-<<<<<<< HEAD
           ninja -v -k0
       - name: Save ccache
         if: ${{always() && steps.build.outcome == 'success'}}
@@ -191,9 +190,7 @@ jobs:
         with:
           path: ${{env.CCACHE_DIR}}
           key: ccache-${{env.CMAKE_PRESET}}-${{matrix.geant}}-${{github.run_id}}
-=======
             ninja -v -k0
->>>>>>> develop
       - name: Regenerate ROOT test data
         if: ${{
           matrix.geant == '11.0'