Fix leftover from a merge conflict

celeritas-project · Jan 4, 2025 · 6e1cb27 · 6e1cb27
1 parent e945e64
commit 6e1cb27
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/.github/workflows/build-spack.yml b/.github/workflows/build-spack.yml
@@ -183,17 +183,14 @@ jobs:
         if: ${{matrix.special != 'clang-tidy'}}
         working-directory: build
         run: |
-<<<<<<< HEAD
           ninja -v -k0
       - name: Save ccache
         if: ${{always() && steps.build.outcome == 'success'}}
         uses: actions/cache/save@v4
         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'