Add required shell property

haskell · Jan 5, 2022 · b956c3b · b956c3b
1 parent ddfede4
commit b956c3b
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/.github/actions/setup-build/action.yml b/.github/actions/setup-build/action.yml
@@ -25,10 +25,8 @@ runs:
       name: (Windows) Platform config
       run: |
         echo "CABAL_PKGS_DIR=C:\\cabal\\packages" >> $GITHUB_ENV
-<<<<<<< HEAD
       shell: bash
-=======
->>>>>>> ce57b1dc (Extract out ci build setup)
+
     - if: ( inputs.os == 'Linux' ) || ( inputs.os == 'macOS' )
       name: (Linux,macOS) Platform config
       run: |