message: Fix a merge conflict.
diff: @@ -233,12 +233,12 @@ jobs:
  shell: cmd
  run: |
  call refreshenv
  - make build-capi-cranelift
  + set WASMER_DIR=%CD%\package
  make test-integration
  if: matrix.run_integration_tests && matrix.os == 'windows-latest'
  - name: Run integration tests (Unix)
  run: |
  - make build-capi-cranelift
  + export WASMER_DIR=`pwd`/package
  make test-integration
  if: matrix.run_integration_tests && matrix.os != 'windows-latest'
  - name: Cross compile from Linux
  