Resolver settings fix, info box and func working!

This commit is contained in:
Belen Curcio
2017-01-23 19:45:34 -03:00
parent d1621ad424
commit adf4729d89
+2 -2
View File
@@ -7,9 +7,9 @@ const Asset = {
.then((globalSettings) => {
if (settings) {
settings = Object.assign({}, settings, globalSettings);
settings = Object.assign({}, settings, globalSettings.toObject());
} else {
settings = globalSettings;
settings = globalSettings.toObject();
}
return settings;