From: Grant Slater <git@firefishy.com>
Date: Mon, 21 Mar 2022 13:03:42 +0000 (+0000)
Subject: supybot: fix git branches to follow
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/fec84f2390675310281df40289172cf44e85418b

supybot: fix git branches to follow
---

diff --git a/cookbooks/supybot/templates/default/git.conf.erb b/cookbooks/supybot/templates/default/git.conf.erb
index 879694547..9dbdc8710 100644
--- a/cookbooks/supybot/templates/default/git.conf.erb
+++ b/cookbooks/supybot/templates/default/git.conf.erb
@@ -129,7 +129,7 @@ commit message = [%s|%b|%a] %m %l
 [osm-id]
 short name = osm-id
 url = https://github.com/openstreetmap/iD.git
-branch = master
+branch = develop
 commit link = https://github.com/openstreetmap/iD/commit/%c
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
@@ -209,7 +209,7 @@ commit message = [%s|%b|%a] %m %l
 [osmlab-osm-community-index]
 short name = osmlab-osm-community-index
 url = https://github.com/osmlab/osm-community-index.git
-branch = master
+branch = main
 commit link = https://github.com/osmlab/osm-community-index/commit/%c
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l