Skip to content

Commit ebf54ab

Browse files
committed
[removed] Dependency on react/lib/merge
1 parent a381cf6 commit ebf54ab

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

modules/helpers/Path.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
var invariant = require('react/lib/invariant');
2-
var merge = require('react/lib/merge');
32
var qs = require('querystring');
3+
var mergeProperties = require('./mergeProperties');
44
var URL = require('./URL');
55

66
var paramMatcher = /((?::[a-z_$][a-z0-9_$]*)|\*)/ig;
@@ -117,7 +117,7 @@ var Path = {
117117
var existingQuery = Path.extractQuery(path);
118118

119119
if (existingQuery)
120-
query = query ? merge(existingQuery, query) : existingQuery;
120+
query = query ? mergeProperties(existingQuery, query) : existingQuery;
121121

122122
var queryString = query && qs.stringify(query);
123123

0 commit comments

Comments
 (0)