From 09aff21db9610d86d54da9b06feb50baf0c79ea8 Mon Sep 17 00:00:00 2001 From: nikhiljindal Date: Thu, 17 Mar 2016 13:30:22 -0700 Subject: [PATCH] Fixing merge conflict in swagger-ui/index.html --- third_party/swagger-ui/index.html | 135 ++++-------------------------- 1 file changed, 16 insertions(+), 119 deletions(-) diff --git a/third_party/swagger-ui/index.html b/third_party/swagger-ui/index.html index cd30add6e9ae6..af9dfdcc446bf 100644 --- a/third_party/swagger-ui/index.html +++ b/third_party/swagger-ui/index.html @@ -2,13 +2,12 @@ Swagger UI - - - + + @@ -16,11 +15,13 @@ + - + + @@ -100,102 +96,3 @@
-======= - - - - Swagger UI - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-
- -