diff options
| author | Benedikt Peetz <benedikt.peetz@b-peetz.de> | 2025-01-29 18:11:24 +0100 |
|---|---|---|
| committer | Benedikt Peetz <benedikt.peetz@b-peetz.de> | 2025-01-29 18:11:24 +0100 |
| commit | c8ab877e2cd4ef330522e1fc076a65c5310f5955 (patch) | |
| tree | 6c5479556a581efecd54817305e32885b9510f68 /build.sh | |
| parent | fix(src/assets/javascripts/services.js): Use new `redlib` instance (diff) | |
| download | libredirect-c8ab877e2cd4ef330522e1fc076a65c5310f5955.zip | |
build(build.sh): Use correct remote names
Diffstat (limited to '')
| -rwxr-xr-x | build.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/build.sh b/build.sh index 80598899..c0c39462 100755 --- a/build.sh +++ b/build.sh @@ -1,7 +1,7 @@ #!/usr/bin/env sh git fetch --all -git merge origin/master fork/master +git merge upstream/master origin/master npm install npm run html # Generates html using Pug @@ -9,5 +9,4 @@ npm run build echo "You can now take the generated extensions to mozilla" - # vim: ft=sh |