From 75cc0fb4185d7248e1800a2daae55cbb79b72564 Mon Sep 17 00:00:00 2001 From: Glenn Rice <47527406+drgrice1@users.noreply.github.com> Date: Wed, 14 Jul 2021 15:25:21 -0500 Subject: [PATCH] Change master to main in defaults.config and localOverrides.conf.dist. (#1439) --- conf/defaults.config | 4 ++-- conf/localOverrides.conf.dist | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/defaults.config b/conf/defaults.config index 191abeb6f9..88ba64f2f9 100644 --- a/conf/defaults.config +++ b/conf/defaults.config @@ -145,9 +145,9 @@ $courseURLs{feedbackFormURL} = ""; $enableGitUpgradeNotifier = 0; $gitWeBWorKRemoteName = "origin"; -$gitWeBWorKBranchName = "master"; +$gitWeBWorKBranchName = "main"; $gitPGRemoteName = "origin"; -$gitPGBranchName = "master"; +$gitPGBranchName = "main"; $gitLibraryRemoteName = "origin"; $gitLibraryBranchName = "master"; diff --git a/conf/localOverrides.conf.dist b/conf/localOverrides.conf.dist index 61c6e2f056..da1c93399b 100644 --- a/conf/localOverrides.conf.dist +++ b/conf/localOverrides.conf.dist @@ -70,9 +70,9 @@ $mail{feedbackRecipients} = [ #$enableGitUpgradeNotifier = 1; #$gitWeBWorKRemoteName = "origin"; -#$gitWeBWorKBranchName = "master"; +#$gitWeBWorKBranchName = "main"; #$gitPGRemoteName = "origin"; -#$gitPGBranchName = "master"; +#$gitPGBranchName = "main"; #$gitLibraryRemoteName = "origin"; #$gitLibraryBranchName = "master";