Replace merge with assign (#673)

* bump vertical-collection to v1.0.0-beta.13 * replace merge with assign
adopted-ember-addons · Mar 15, 2019 · f7f5423 · f7f5423
1 parent 3b5782d
commit f7f5423
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(assign({}, globalOptions), options);
 }