Skip to content

Commit

Permalink
Merge branch 'next' of github.com:diced/zipline into next
Browse files Browse the repository at this point in the history
  • Loading branch information
diced committed Nov 10, 2020
2 parents a900daa + b61a283 commit 23a21cf
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion setup.js
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ const base = {
urls: { ...base.urls, ...urls }
};

writeFileSync('Ziplined.toml', stringify(config));
writeFileSync('Zipline.toml', stringify(config));

if (docker.useDocker) {
console.log('Generating docker-compose.yml...');
Expand Down
6 changes: 3 additions & 3 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3639,9 +3639,9 @@ find-cache-dir@^2.1.0:
pkg-dir "^3.0.0"

find-my-way@^3.0.0:
version "3.0.4"
resolved "https://registry.yarnpkg.com/find-my-way/-/find-my-way-3.0.4.tgz#a485973d1a3fdafd989ac9f12fd2d88e83cda268"
integrity sha512-Trl/mNAVvTgCpo9ox6yixkwiZUvecKYUQZoAuMCBACsgGqv+FbWe+jE5sBA5+U8LIWrJk/cw8zPV53GPrjTnsw==
version "3.0.5"
resolved "https://registry.yarnpkg.com/find-my-way/-/find-my-way-3.0.5.tgz#f71c5ef1b4865401e1b97ba428121a8f55439eec"
integrity sha512-FweGg0cv1sBX8z7WhvBX5B5AECW4Zdh/NiB38Oa0qwSNIyPgRBCl/YjxuZn/rz38E/MMBHeVKJ22i7W3c626Gg==
dependencies:
fast-decode-uri-component "^1.0.1"
safe-regex2 "^2.0.0"
Expand Down

0 comments on commit 23a21cf

Please sign in to comment.