Conflicts:
	site.conf
This commit is contained in:
ohrensessel 2014-06-11 00:35:31 +02:00
commit 904f138c18

View file

@ -19,7 +19,7 @@
mesh_mcast_rate = 12000, mesh_mcast_rate = 12000,
}, },
wifi5 = { wifi5 = {
ssid = 'hamburg.freifunk.net (5GHz)', ssid = 'hamburg.freifunk.net',
channel = 44, channel = 44,
htmode = 'HT40+', htmode = 'HT40+',
mesh_ssid = 'f8:d1:11:87:52:2e', mesh_ssid = 'f8:d1:11:87:52:2e',