From 2db90463d79fc3ba8796ef0fd01e401319561db9 Mon Sep 17 00:00:00 2001 From: cadyn <35672377+cadyn@users.noreply.github.com> Date: Sat, 19 Jun 2021 22:12:14 -0700 Subject: [PATCH] Fix merge file --- tools/ch-merge-upstream-pull-request.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/ch-merge-upstream-pull-request.sh b/tools/ch-merge-upstream-pull-request.sh index fdfa5db522..c27c479a70 100644 --- a/tools/ch-merge-upstream-pull-request.sh +++ b/tools/ch-merge-upstream-pull-request.sh @@ -40,8 +40,8 @@ containsElement () { } # Make sure we have our upstream remote -if ! git remote | grep tgstation > /dev/null; then - git remote add tgstation https://github.com/tgstation/tgstation.git +if ! git remote | grep upstream > /dev/null; then + git remote add upstream https://github.com/VOREStation/VOREStation.git fi #curl -v \