From: Tom Hughes <tom@compton.nu>
Date: Wed, 27 Jun 2018 23:50:08 +0000 (+0100)
Subject: Merge remote-tracking branch 'github/pull/169'
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/bff262debe7a3c7fb831433066c17028bb5d9e06?hp=8b30d64dc31c38fff3613794e599a82feaec0635

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

diff --git a/cookbooks/cgiirc/templates/default/cgiirc.config.erb b/cookbooks/cgiirc/templates/default/cgiirc.config.erb
index 9b2f0907f..794b4cb01 100644
--- a/cookbooks/cgiirc/templates/default/cgiirc.config.erb
+++ b/cookbooks/cgiirc/templates/default/cgiirc.config.erb
@@ -8,7 +8,7 @@
 # Configure defaults
 default_server = irc.oftc.net
 default_port = 6667
-default_channel = #osm,#osm-dev,#osm-ewg,#osm-ar,#osm-asia,#osm-au,#osm-br,#osm-bw,#osm-by,#osm-ca,#osm-ch,#osm-cz,#osm-de,#osm-dk,#osm-es,#osm-fi,#osm-fr,#osm-gb,#osm-gr,#osm-gsoc,#osm-ht,#osm-ie,#osm-it,#osm-ke,#osm-latam,#osm-local,#osm-lv,#osm-nl,#osm-no,#osm-nominatim,#osm-pl,#osm-pt,#osm-ru,#osm.se,#osm-strategic,#osm-ua,#osm-us,#osm-za,#osm-zh,#osmf-gm,#osrm,#openrailwaymap,#hot
+default_channel = #osm,#osm-dev,#osm-ewg,#osm-cwg,#osm-ar,#osm-asia,#osm-au,#osm-br,#osm-bw,#osm-by,#osm-ca,#osm-ch,#osm-cz,#osm-de,#osm-dk,#osm-es,#osm-fi,#osm-fr,#osm-gb,#osm-gr,#osm-gsoc,#osm-ht,#osm-ie,#osm-it,#osm-ke,#osm-latam,#osm-local,#osm-lv,#osm-nl,#osm-no,#osm-nominatim,#osm-pl,#osm-pt,#osm-ru,#osm.se,#osm-strategic,#osm-ua,#osm-us,#osm-za,#osm-zh,#osmf-gm,#osrm,#openrailwaymap,#hot
 default_name = CGI:IRC User
 default_nick = CGI???