Skip to content

Commit

Permalink
fix merge deprecation warning (#204)
Browse files Browse the repository at this point in the history
  • Loading branch information
jdaviderb authored and marcoow committed Jan 14, 2019
1 parent 3626abc commit fead831
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion addon/services/cookies.js
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ export default Service.extend({

_cacheFastBootCookie(name, value, options = {}) {
let fastBootCache = this._fastBootCookiesCache || {};
let cachedOptions = merge({}, options);
let cachedOptions = assign({}, options);

if (cachedOptions.maxAge) {
let expires = new Date();
Expand Down

0 comments on commit fead831

Please sign in to comment.