mergeInto replaced with object-assign

yocontra · Feb 8, 2015 · 26f2e95 · 26f2e95
1 parent dcdb812
commit 26f2e95
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/mediaQuery.js b/src/mediaQuery.js
@@ -1,5 +1,5 @@
 var PropTypes = require('react/lib/ReactPropTypes');
-var mergeInto = require('react/lib/mergeInto');
+var assign = require('object-assign');
 
 var stringOrNumber = PropTypes.oneOfType([
   PropTypes.string,
@@ -71,11 +71,11 @@ var types = {
 };
 
 var all = {};
-mergeInto(all, types);
-mergeInto(all, features);
+assign(all, types);
+assign(all, features);
 
 module.exports = {
   all: all,
   types: types,
   features: features
-};
+};