diff options
| author | Soispha <soispha@vhack.eu> | 2023-10-25 23:24:36 +0200 |
|---|---|---|
| committer | Soispha <soispha@vhack.eu> | 2023-10-25 23:24:36 +0200 |
| commit | 4e8a192c533addc98ce3bc837591af7bb14273ee (patch) | |
| tree | 516dce565b750d2a3e31988c3b2cb38ea918ca5b | |
| parent | chore(merge): remote-tracking branch 'origin/master' (diff) | |
| download | libredirect-4e8a192c533addc98ce3bc837591af7bb14273ee.zip | |
build(build.sh): Add support for merging
| -rwxr-xr-x | build.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/build.sh b/build.sh index 4a5281e1..80598899 100755 --- a/build.sh +++ b/build.sh @@ -1,5 +1,7 @@ #!/usr/bin/env sh +git fetch --all +git merge origin/master fork/master npm install npm run html # Generates html using Pug |