aboutsummaryrefslogtreecommitdiffstats
path: root/core/storagemanager.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2015-01-21 01:29:00 +0000
committerMatthew Wild <mwild1@gmail.com>2015-01-21 01:29:00 +0000
commitcd0dd3f92b02d855c98701792c179d02ad12bf24 (patch)
treea2ed9fcc1c1496bdcbdf1da40e868aa4d50246fa /core/storagemanager.lua
parent6591bd9db584bf6c5b8920c4438cd087bbfefce3 (diff)
parent5723bad906dcbef98eb1cdc196675a7a526f97cc (diff)
downloadprosody-cd0dd3f92b02d855c98701792c179d02ad12bf24.tar.gz
prosody-cd0dd3f92b02d855c98701792c179d02ad12bf24.zip
Merge 0.10->trunk
Diffstat (limited to 'core/storagemanager.lua')
-rw-r--r--core/storagemanager.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/storagemanager.lua b/core/storagemanager.lua
index b2ad29d0..d16bdce5 100644
--- a/core/storagemanager.lua
+++ b/core/storagemanager.lua
@@ -1,5 +1,5 @@
-local error, type, pairs = error, type, pairs;
+local type, pairs = type, pairs;
local setmetatable = setmetatable;
local config = require "core.configmanager";