use assign instead of merge

CoSchedule · Apr 3, 2019 · 249313a · 249313a
1 parent 69fe819
commit 249313a
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);
 }