git.delta.rocks / unique-network / refs/commits / 4f6c04115e1f

--- a/.github/workflows/dev-build-tests_v2.yml
+++ b/.github/workflows/dev-build-tests_v2.yml
@@ -72,10 +72,7 @@
           yarn install
           yarn add mochawesome
           node scripts/readyness.js
-<<<<<<< HEAD:.github/workflows/dev-build-tests_v2.yml
           echo "Ready to start tests"
-=======
->>>>>>> develop:.github/workflows/dev-build-tests_v2.yml
           yarn polkadot-types
           NOW=$(date +%s) && yarn test --reporter mochawesome --reporter-options reportFilename=test-${NOW}
         env:

174      - name: Stop running containers174      - name: Stop running containers
175        if: always()                   # run this step always175        if: always()                   # run this step always
176        run: docker-compose -f "qa-tests/.docker/docker-compose.market.yml" -f "qa-tests/.docker/docker-compose.${{ matrix.network }}.yml" down --volumes176        run: docker-compose -f "qa-tests/.docker/docker-compose.market.yml" -f "qa-tests/.docker/docker-compose.${{ matrix.network }}.yml" down --volumes
177#        run: docker-compose -f "qa-tests/.docker/docker-compose.market.yml" -f "qa-tests/.docker/docker-compose.${{ matrix.network }}.yml" down
178177
179      - name: Remove builder cache178      - name: Remove builder cache
180        if: always()                   # run this step always179        if: always()                   # run this step always

--- a/.github/workflows/xcm-tests_v2.yml
+++ b/.github/workflows/xcm-tests_v2.yml
@@ -60,10 +60,6 @@
       matrix:
         include: ${{fromJson(needs.prepare-execution-marix.outputs.matrix)}}
 
-<<<<<<< HEAD
-=======
-
->>>>>>> develop
     steps:
       - name: Skip if pull request is in Draft
         if: github.event.pull_request.draft == true