diff options
| author | Kim Alvefur <zash@zash.se> | 2013-03-23 04:17:39 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2013-03-23 04:17:39 +0100 |
| commit | 2bde8103f5dba708e6e7a9b0773eba493bfefa7c (patch) | |
| tree | fc52870bbca26966e739b1654dd7ff728fbbd9e0 /core/sessionmanager.lua | |
| parent | bcd8f33f5be7555e0c7863b76e950bd9d156afe0 (diff) | |
| parent | aa0eb8fdc87589433a1cd5d03f136fb6f32a7426 (diff) | |
| download | prosody-2bde8103f5dba708e6e7a9b0773eba493bfefa7c.tar.gz prosody-2bde8103f5dba708e6e7a9b0773eba493bfefa7c.zip | |
Merge 0.9->trunk
Diffstat (limited to 'core/sessionmanager.lua')
| -rw-r--r-- | core/sessionmanager.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/sessionmanager.lua b/core/sessionmanager.lua index 05b2d64b..e721835d 100644 --- a/core/sessionmanager.lua +++ b/core/sessionmanager.lua @@ -140,7 +140,7 @@ function bind_resource(session, resource) local sessions = hosts[session.host].sessions[session.username].sessions; if sessions[resource] then -- Resource conflict - local policy = config_get(session.host, "core", "conflict_resolve"); + local policy = config_get(session.host, "conflict_resolve"); local increment; if policy == "random" then resource = uuid_generate(); |