fix conflict

anza-xyz · Jul 2, 2024 · 1f2ebfc · 1f2ebfc
1 parent c5f45b6
commit 1f2ebfc
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/.github/workflows/downstream-project-spl.yml b/.github/workflows/downstream-project-spl.yml
@@ -53,13 +53,10 @@ jobs:
       - shell: bash
         run: |
           source .github/scripts/downstream-project-spl-common.sh
-<<<<<<< HEAD
           source .github/scripts/downstream-project-spl-install-deps.sh
-=======
           if [ -n "$SKIP_SPL_DOWNSTREAM_PROJECT_TEST" ]; then
             exit 0
           fi
->>>>>>> 4d9d27f1ff (ci: skip spl test when version is too high (#1945))
 
           cargo check
 
@@ -108,13 +105,10 @@ jobs:
       - shell: bash
         run: |
           source .github/scripts/downstream-project-spl-common.sh
-<<<<<<< HEAD
           source .github/scripts/downstream-project-spl-install-deps.sh
-=======
           if [ -n "$SKIP_SPL_DOWNSTREAM_PROJECT_TEST" ]; then
             exit 0
           fi
->>>>>>> 4d9d27f1ff (ci: skip spl test when version is too high (#1945))
 
           programStr="${{ tojson(matrix.arrays.required_programs) }}"
           IFS=', ' read -ra programs <<<"${programStr//[\[\]$'\n'$'\r' ]/}"