Resolve merge conflict in test.yaml

lsst · Dec 6, 2024 · c8f0266 · c8f0266
1 parent e093751
commit c8f0266
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -36,13 +36,8 @@ jobs:
             git clone https://github.com/lsst/testdata_ci_imsim
             ls
             # setup -j -r testdata_ci_imsim
-<<<<<<< HEAD
-            cd -
-
-=======
             # cd -
 
->>>>>>> 04353b9 ([pre-commit.ci] auto fixes from pre-commit.com hooks)
       - name: Install DM stack and mypy with conda/mamba
         shell: bash -l {0}
         run: |