updated version, client

This commit is contained in:
Tony Tam
2015-02-21 00:39:24 -08:00
committed by Mohsen Azimi
parent ba0d213329
commit 7caac4f4ae
2 changed files with 9 additions and 1 deletions

View File

@@ -1,6 +1,10 @@
/** /**
* swagger-client - swagger.js is a javascript client for use with swaggering APIs. * swagger-client - swagger.js is a javascript client for use with swaggering APIs.
<<<<<<< HEAD
* @version v2.1.9-M1 * @version v2.1.9-M1
=======
* @version v2.1.8-M1
>>>>>>> updated version, client
* @link http://swagger.io * @link http://swagger.io
* @license apache 2.0 * @license apache 2.0
*/ */
@@ -3043,6 +3047,10 @@ SwaggerHttp.prototype.execute = function(obj, opts) {
else { else {
obj.contentType = false; obj.contentType = false;
obj.processData = false; obj.processData = false;
<<<<<<< HEAD
=======
// delete obj.cache;
>>>>>>> updated version, client
delete obj.headers['Content-Type']; delete obj.headers['Content-Type'];
} }
} }

View File

@@ -18,7 +18,7 @@
"dependencies": { "dependencies": {
"shred": "0.8.10", "shred": "0.8.10",
"btoa": "1.1.1", "btoa": "1.1.1",
"swagger-client": "2.1.7-M1" "swagger-client": "2.1.8-M1"
}, },
"devDependencies": { "devDependencies": {
"chai": "^1.10.0", "chai": "^1.10.0",