fixed conflicts

abh · Mar 16, 2011 · 86d9e35 · 86d9e35
2 parents 5febdd7 + e07b152
commit 86d9e35
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/restler.js b/lib/restler.js
@@ -270,7 +270,7 @@ mixin(Service.prototype, {
     return del(this._url(path), this._withDefaults(options));
   },
   _url: function(path) {
-    if (this.baseURL) return uri.resolve(this.baseURL, path);
+    if (this.baseURL) return url.resolve(this.baseURL, path);
     else return path;
   },
   _withDefaults: function(options) {
@@ -297,4 +297,4 @@ mixin(exports, {
   parsers: parsers,
   file: multipart.file,
   data: multipart.data
-});
+});