API generation

Author: delvedor

api/api/indices.put_mapping.js

@@ -111,23 +111,13 @@ function buildIndicesPutMapping (opts) {
     } else if ((index) != null && (type) != null) {
       path = '/' + encodeURIComponent(index) + '/' + '_mappings' + '/' + encodeURIComponent(type)
     } else if ((type) != null) {
-<<<<<<< HEAD
       path = '/' + '_mapping' + '/' + encodeURIComponent(type)
     } else if ((type) != null) {
       path = '/' + '_mappings' + '/' + encodeURIComponent(type)
     } else if ((index) != null) {
       path = '/' + encodeURIComponent(index) + '/' + '_mappings'
     } else {
       path = '/' + encodeURIComponent(index) + '/' + '_mapping'
-=======
-      path = '/' + '_mappings' + '/' + encodeURIComponent(type)
-    } else if ((type) != null) {
-      path = '/' + '_mapping' + '/' + encodeURIComponent(type)
-    } else if ((index) != null) {
-      path = '/' + encodeURIComponent(index) + '/' + '_mapping'
-    } else {
-      path = '/' + encodeURIComponent(index) + '/' + '_mappings'
->>>>>>> 349b832... Support for deprecated paths (#828)
     }
 
     // build request object

api/api/nodes.hot_threads.js

@@ -101,14 +101,9 @@ function buildNodesHotThreads (opts) {
     } else if ((node_id || nodeId) != null) {
       path = '/' + '_cluster' + '/' + 'nodes' + '/' + encodeURIComponent(node_id || nodeId) + '/' + 'hot_threads'
     } else if ((node_id || nodeId) != null) {
-<<<<<<< HEAD
       path = '/' + '_nodes' + '/' + encodeURIComponent(node_id || nodeId) + '/' + 'hotthreads'
     } else if ((node_id || nodeId) != null) {
-=======
->>>>>>> 349b832... Support for deprecated paths (#828)
       path = '/' + '_nodes' + '/' + encodeURIComponent(node_id || nodeId) + '/' + 'hot_threads'
-    } else if ((node_id || nodeId) != null) {
-      path = '/' + '_nodes' + '/' + encodeURIComponent(node_id || nodeId) + '/' + 'hotthreads'
     } else {
       path = '/' + '_cluster' + '/' + 'nodes' + '/' + 'hotthreads'
     }