Skip to content

Commit

Permalink
Patch fixes merge conflict.
Browse files Browse the repository at this point in the history
  • Loading branch information
kristoferjoseph committed Apr 12, 2018
1 parent ff9de72 commit 6237aef
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
1 change: 0 additions & 1 deletion index.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ module.exports = function Redeux (initialState) {
r = args[i]
key = r.key || r.name
if (typeof r === 'function') {
reducers.push(r)
state[key] = r(state[key])
reducers.push(r)
}
Expand Down
2 changes: 1 addition & 1 deletion redeux.umd.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 6237aef

Please sign in to comment.