Georg/dbot
1
0
Fork 0
forked from GitHub/dbot
Code Issues Pull Requests Projects Releases Wiki Activity

merge earlier

Browse Source
This commit is contained in:
reality 2013-04-30 17:10:21 +00:00
parent 4891b70ec3
commit b08e12560f
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
run.js
View File

@ -295,19 +295,7 @@ DBot.prototype.reloadModules = function() {
}
this.modules[module.name] = module;
<<<<<<< HEAD
}.bind(this));
=======
} catch(err) {
console.log(this.t('module_load_error', { 'moduleName': name }));
this.status[name] = err + ' - ' + err.stack.split('\n')[1].trim();
if(this.config.debugMode) {
console.log('MODULE ERROR (' + name + '): ' + err.stack );
} else {
console.log('MODULE ERROR (' + name + '): ' + err );
}
}
>>>>>>> 2afb1c6ba37eb92f875124c754453bb063f42277
}.bind(this));
process.nextTick(function() {