Skip to content
This repository has been archived by the owner on Jun 15, 2021. It is now read-only.

Commit

Permalink
Merge pull request #500 from jameslawson/master
Browse files Browse the repository at this point in the history
Remove Unexpected Usage of ES6 const
  • Loading branch information
katebee authored Jan 27, 2017
2 parents f75096e + bc58854 commit dd0c4a3
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ define(['immutable'], function (immutable) {


function defaults(options, defaultOptions) {
const optionsCopy = immutable.fromJS(options);
const defaultsCopy = immutable.fromJS(defaultOptions);
const mergedOptions = defaultsCopy.merge(optionsCopy);
var optionsCopy = immutable.fromJS(options);
var defaultsCopy = immutable.fromJS(defaultOptions);
var mergedOptions = defaultsCopy.merge(optionsCopy);
return mergedOptions.toJS();
}

Expand Down

0 comments on commit dd0c4a3

Please sign in to comment.