[removed] Dependency on react/lib/merge

remix-run · Jul 22, 2014 · ebf54ab · ebf54ab
1 parent a381cf6
commit ebf54ab
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/modules/helpers/Path.js b/modules/helpers/Path.js
@@ -1,6 +1,6 @@
 var invariant = require('react/lib/invariant');
-var merge = require('react/lib/merge');
 var qs = require('querystring');
+var mergeProperties = require('./mergeProperties');
 var URL = require('./URL');
 
 var paramMatcher = /((?::[a-z_$][a-z0-9_$]*)|\*)/ig;
@@ -117,7 +117,7 @@ var Path = {
     var existingQuery = Path.extractQuery(path);
 
     if (existingQuery)
-      query = query ? merge(existingQuery, query) : existingQuery;
+      query = query ? mergeProperties(existingQuery, query) : existingQuery;
 
     var queryString = query && qs.stringify(query);