Merge pull request #423 from ueokande/greenkeeper/eslint-5.0.1

Update eslint

1 files changed, 2 insertions, 4 deletions

diff --git a/src/shared/settings/storage.js b/src/shared/settings/storage.js
index 87843ed..5dce3b0 100644
--- a/src/shared/settings/storage.js
+++ b/src/shared/settings/storage.js
@@ -6,7 +6,7 @@ const loadRaw = async() => {
   if (!settings) {
     return DefaultSettings;
   }
-  return Object.assign({}, DefaultSettings, settings);
+  return { ...DefaultSettings, ...settings };
 };
 
 const loadValue = async() => {
@@ -20,9 +20,7 @@ const loadValue = async() => {
   if (!value.properties) {
     value.properties = {};
   }
-  return Object.assign({},
-    settingsValues.valueFromJson(DefaultSettings.json),
-    value);
+  return { ...settingsValues.valueFromJson(DefaultSettings.json), ...value };
 };
 
 const save = (settings) => {