Browse files

fixed conflicts

  • Loading branch information...
2 parents 5febdd7 + e07b152 commit 86d9e35f79bd86ed61d29cd49b5cc5427466e851 @danwrong danwrong committed Mar 15, 2011
Showing with 2 additions and 2 deletions.
  1. +2 −2 lib/restler.js
View
4 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
-});
+});

0 comments on commit 86d9e35

Please sign in to comment.