wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-23 13:10:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed bug

Browse Source
This commit is contained in:
Wyatt Johnson
2018-05-07 17:59:43 -06:00
parent 15c3a96291
commit a7c9f01125
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
graph/resolvers/asset.js
+2 -2
View File
@@ -72,9 +72,9 @@ const Asset = {
// if we have some.
let globalSettings = await Settings.select(...fields);
if (settings !== null) {
settings = Object.assign({}, globalSettings.toObject(), settings);
settings = Object.assign({}, globalSettings, settings);
} else {
settings = globalSettings.toObject();
settings = globalSettings;
}
return settings;