diff options
| -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 |