diff --git a/dist/lib/swagger-client.js b/dist/lib/swagger-client.js index d11467a9..d5ca3135 100644 --- a/dist/lib/swagger-client.js +++ b/dist/lib/swagger-client.js @@ -1,10 +1,6 @@ /** * 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 */ @@ -3047,10 +3043,6 @@ 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/dist/swagger-ui.js b/dist/swagger-ui.js index 90bd7a77..29873aa1 100644 --- a/dist/swagger-ui.js +++ b/dist/swagger-ui.js @@ -199,6 +199,14 @@ var Docs = { } }; +this["Handlebars"] = this["Handlebars"] || {}; +this["Handlebars"]["templates"] = this["Handlebars"]["templates"] || {}; +this["Handlebars"]["templates"]["apikey_button_view"] = Handlebars.template({"compiler":[6,">= 2.0.0-beta.1"],"main":function(depth0,helpers,partials,data) { + var helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression; + return "\n