Skip to content

Commit

Permalink
Resolve master conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
assafmo committed Oct 17, 2022
1 parent 93cd444 commit dc58886
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ jobs:
make kill-localsecret # next step needs the localsecret ports
- name: Run secret.js tests
run: |
git clone --depth 1 https://github.com/scrtlabs/secret.js
git clone --depth 1 --branch master https://github.com/scrtlabs/secret.js
cd secret.js
# Use the docker images that we built just a few steps above
perl -i -pe 's/localsecret:.+?"/localsecret:v0.0.0"/' ./test/*
Expand Down

0 comments on commit dc58886

Please sign in to comment.