diff options
| author | Kim Alvefur <zash@zash.se> | 2013-03-23 02:33:15 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2013-03-23 02:33:15 +0100 |
| commit | 1acfdf5914a91071da52f2203dce90ec3c30d5ba (patch) | |
| tree | ecc07df37df1db9a79a86f936ed683a9654861f4 /core/sessionmanager.lua | |
| parent | 974917a5a22e27441c086474be2672b3ba1fa3af (diff) | |
| download | prosody-1acfdf5914a91071da52f2203dce90ec3c30d5ba.tar.gz prosody-1acfdf5914a91071da52f2203dce90ec3c30d5ba.zip | |
core.*: Complete removal of all traces of the "core" section and section-related code.
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(); |