Merge pull request adopted-ember-addons#681 from bekzod/use-assign-2

CoSchedule · Apr 20, 2019 · 43a34f5 · 43a34f5
2 parents 69fe819 + 249313a
commit 43a34f5
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/addon/-private/global-options.js b/addon/-private/global-options.js
@@ -1,4 +1,4 @@
-import { merge } from '@ember/polyfills';
+import { assign } from '@ember/polyfills';
 import config from 'ember-get-config';
 
 // eslint-disable-next-line ember-suave/no-direct-property-access
@@ -7,5 +7,5 @@ const globalOptions = config['ember-light-table'] || {};
 export default globalOptions;
 
 export function mergeOptionsWithGlobals(options) {
-  return merge(merge({}, globalOptions), options);
+  return assign({}, globalOptions, options);
 }