From bda30e9682b254dcda4493b462b8ce8c4c4cf91d Mon Sep 17 00:00:00 2001 From: Simon Eisenmann Date: Sat, 1 Mar 2014 12:09:06 +0100 Subject: [PATCH] Fixed merge bug. Signed-off-by: Simon Eisenmann --- src/app/spreed-speakfreely-server/config.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/spreed-speakfreely-server/config.go b/src/app/spreed-speakfreely-server/config.go index b480cd1b..99ffafd5 100644 --- a/src/app/spreed-speakfreely-server/config.go +++ b/src/app/spreed-speakfreely-server/config.go @@ -38,7 +38,7 @@ type Config struct { Plugin string // Plugin to load } -func NewConfig(title, ver, runtimeVersion, basePath string, stunURIs, turnURIs []string, tokens bool, globalRoomid, string, defaultRoomEnabled bool, plugin string) *Config { +func NewConfig(title, ver, runtimeVersion, basePath string, stunURIs, turnURIs []string, tokens bool, globalRoomid string, defaultRoomEnabled bool, plugin string) *Config { sv := fmt.Sprintf("static/ver=%s", ver) return &Config{Title: title, ver: ver, S: sv, B: basePath, StunURIs: stunURIs, TurnURIs: turnURIs, Tokens: tokens, Version: runtimeVersion, globalRoomid: globalRoomid, defaultRoomEnabled: defaultRoomEnabled, Plugin: plugin} }