From ebf54ab366f64c08a0db6cc8e035b6585f0558b4 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Mon, 21 Jul 2014 16:45:27 -0700
Subject: [PATCH] [removed] Dependency on react/lib/merge

---
 modules/helpers/Path.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/helpers/Path.js b/modules/helpers/Path.js
index 0fa709736e..a48411c3ca 100644
--- 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);