From: Tom Hughes <tom@compton.nu>
Date: Fri, 31 May 2019 09:29:13 +0000 (+0100)
Subject: Merge remote-tracking branch 'github/pull/240'
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/74578d9b7ea12c16fb5fe9c5ee0922660968cd94?hp=94b26f4794c7ff6a16e956953e00f7bdd738080b

Merge remote-tracking branch 'github/pull/240'
---

diff --git a/cookbooks/supybot/templates/default/git.conf.erb b/cookbooks/supybot/templates/default/git.conf.erb
index c0a54a3d8..a8a300cd0 100644
--- a/cookbooks/supybot/templates/default/git.conf.erb
+++ b/cookbooks/supybot/templates/default/git.conf.erb
@@ -79,6 +79,14 @@ commit link = https://github.com/gravitystorm/openstreetmap-carto/commit/%c
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
 
+[osm-carto-schema]
+short name = osm-carto-schema
+url = git://github.com/gravitystorm/openstreetmap-carto.git
+branch = schema_change
+commit link = https://github.com/gravitystorm/openstreetmap-carto/commit/%c
+channels = #osm-dev
+commit message = [%s|%b|%a] %m %l
+
 [osm-osm2pgsql]
 short name = osm-osm2pgsql
 url = git://github.com/openstreetmap/osm2pgsql.git