Fix merge file

This commit is contained in:
cadyn
2021-06-19 22:12:14 -07:00
committed by GitHub
parent b35d59cc5b
commit 2db90463d7

View File

@@ -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 \