mirror of
https://github.com/wassname/talk.git
synced 2026-07-01 04:51:32 +08:00
Resolver settings fix, info box and func working!
This commit is contained in:
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user