From 7caac4f4aec879d97931cf4ce647c8a0a04fcdc6 Mon Sep 17 00:00:00 2001
From: Tony Tam <fehguy@gmail.com>
Date: Sat, 21 Feb 2015 00:39:24 -0800
Subject: [PATCH] updated version, client

---
 dist/lib/swagger-client.js | 8 ++++++++
 package.json               | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/dist/lib/swagger-client.js b/dist/lib/swagger-client.js
index d5ca3135..d11467a9 100644
--- a/dist/lib/swagger-client.js
+++ b/dist/lib/swagger-client.js
@@ -1,6 +1,10 @@
 /**
  * swagger-client - swagger.js is a javascript client for use with swaggering APIs.
+<<<<<<< HEAD
  * @version v2.1.9-M1
+=======
+ * @version v2.1.8-M1
+>>>>>>> updated version, client
  * @link http://swagger.io
  * @license apache 2.0
  */
@@ -3043,6 +3047,10 @@ SwaggerHttp.prototype.execute = function(obj, opts) {
     else {
       obj.contentType = false;
       obj.processData = false;
+<<<<<<< HEAD
+=======
+      // delete obj.cache;
+>>>>>>> updated version, client
       delete obj.headers['Content-Type'];
     }
   }
diff --git a/package.json b/package.json
index 12d1fd0d..b404f70b 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
   "dependencies": {
     "shred": "0.8.10",
     "btoa": "1.1.1",
-    "swagger-client": "2.1.7-M1"
+    "swagger-client": "2.1.8-M1"
   },
   "devDependencies": {
     "chai": "^1.10.0",