Skip to content

Commit

Permalink
Use forked merge-deep
Browse files Browse the repository at this point in the history
  • Loading branch information
jgierer12 committed Jun 8, 2019
1 parent e927a12 commit c131f30
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module.exports = require(`merge-deep`)(
module.exports = require(`@jgierer12/merge-deep`)(
require(`@jgierer12/js-configs/eslint`),
require(`@jgierer12/js-configs/eslint/react`)
);
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
]
},
"dependencies": {
"merge-deep": "^3.0.2"
"@jgierer12/merge-deep": "^3.1.0"
},
"devDependencies": {
"@babel/preset-env": "^7.4.4",
Expand Down
2 changes: 1 addition & 1 deletion src/use-object-state.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from "react";
import deepMerge from "merge-deep";
import deepMerge from "@jgierer12/merge-deep";

/**
* On `setState`, deep-merge old and new state objects.
Expand Down

0 comments on commit c131f30

Please sign in to comment.