From c8ab877e2cd4ef330522e1fc076a65c5310f5955 Mon Sep 17 00:00:00 2001
From: Benedikt Peetz <benedikt.peetz@b-peetz.de>
Date: Wed, 29 Jan 2025 18:11:24 +0100
Subject: build(build.sh): Use correct remote names

---
 build.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'build.sh')

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