From 4e8a192c533addc98ce3bc837591af7bb14273ee Mon Sep 17 00:00:00 2001
From: Soispha <soispha@vhack.eu>
Date: Wed, 25 Oct 2023 23:24:36 +0200
Subject: build(build.sh): Add support for merging

---
 build.sh | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'build.sh')

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
-- 
cgit 1.4.1