kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-27 19:53:36 +00:00
Code Issues Projects Releases Wiki Activity

Update module.js

Browse Source
This commit is contained in:
Andreas 2016-10-31 20:10:52 +01:00 committed by GitHub
parent 6da534a961
commit 6fd0fcfdb5
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/module.js
View File

@ -166,7 +166,7 @@ var Module = Class.extend({
* argument config obejct - Module config. * argument config obejct - Module config.
*/ */
setConfig: function (config) { setConfig: function (config) {
this.config = Object.assign(this.defaults, config); this.config = Object.assign({}, this.defaults, config);
}, },
/* socket() /* socket()