Cleaned up from pull request flatiron#128

ndrut · Aug 5, 2013 · 519ee90 · 519ee90
1 parent 1eb7348
commit 519ee90
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/lib/cradle.js b/lib/cradle.js
@@ -139,7 +139,6 @@ cradle.Connection.prototype.rawRequest = function (options, callback) {
     }
 
     // Set client-wide headers
-<<<<<<< HEAD
     Object.keys(this.options.headers).forEach(function (header) {
         options.headers[header] = self.options.headers[header];
     });
@@ -148,7 +147,6 @@ cradle.Connection.prototype.rawRequest = function (options, callback) {
         for (var k in options.query) {
             if (typeof(options.query[k]) === 'boolean') {
                 options.query[k] = String(options.query[k]);
-=======
     for (var h in this.options.headers) {
         headers[h] = this.options.headers[h];
     }
@@ -161,7 +159,6 @@ cradle.Connection.prototype.rawRequest = function (options, callback) {
         for (var k in options) {
             if (typeof(options[k]) === 'boolean') {
                 options[k] = String(options[k]);
->>>>>>> f9d23f3... support for couchdb in a subdirectory
             }
         }
         options.path += '?' + querystring.stringify(options.query);
@@ -330,10 +327,7 @@ cradle.merge = function (target) {
         });
     });
     return target;
-<<<<<<< HEAD
 };
-=======
 }
 
 
->>>>>>> f9d23f3... support for couchdb in a subdirectory