Cleaning up tests after merge.

This commit is contained in:
David Jay
2016-11-29 16:37:39 -05:00
parent 9499e53021
commit b7ffd31ea4
3 changed files with 78 additions and 77 deletions
+1 -1
View File
@@ -34,7 +34,7 @@ router.get('/', (req, res, next) => {
// Merge the asset specific settings with the returned settings object in
// the event that the asset that was returned also had settings.
if (asset.settings) {
settings = Object.assign(settings, asset.settings);
settings = Object.assign({}, settings, asset.settings);
}
// Fetch the appropriate comments stream.