From 470576aa5bd562af9ebd9e06bf76dfa21aaac0bc Mon Sep 17 00:00:00 2001 From: Logan McNaughton <848146+loganmc10@users.noreply.github.com> Date: Sun, 29 May 2022 18:37:43 -0600 Subject: [PATCH] Update pull_repos.sh --- pull_repos.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pull_repos.sh b/pull_repos.sh index 6ee765a..936fa20 100755 --- a/pull_repos.sh +++ b/pull_repos.sh @@ -25,7 +25,7 @@ git commit -m "update raphnet" git remote add parallel-rsp https://github.com/loganmc10/parallel-rsp.git git fetch parallel-rsp -git merge -s subtree parallel-rsp/master --allow-unrelated-histories --squash +git merge -s subtree parallel-rsp/m64p --allow-unrelated-histories --squash git commit -m "update parallel rsp" git remote add parallel-rdp-standalone https://github.com/loganmc10/parallel-rdp-standalone.git